diff --git a/queries/wgsl/highlights.scm b/queries/wgsl/highlights.scm
index 0411880d7..c46221916 100644
--- a/queries/wgsl/highlights.scm
+++ b/queries/wgsl/highlights.scm
@@ -101,6 +101,6 @@
 (attribute
     (identifier) @attribute)
 
-(comment) @comment
+[(line_comment) (block_comment)] @comment
 
 (ERROR) @error
diff --git a/queries/wgsl/indents.scm b/queries/wgsl/indents.scm
index 69e543ad3..a764122c3 100644
--- a/queries/wgsl/indents.scm
+++ b/queries/wgsl/indents.scm
@@ -16,4 +16,4 @@
   "}"
 ] @branch
 
-(comment) @auto
+[(line_comment) (block_comment)] @auto