diff --git a/queries/cmake/indents.scm b/queries/cmake/indents.scm
index 0c3da0013..787cc2c98 100644
--- a/queries/cmake/indents.scm
+++ b/queries/cmake/indents.scm
@@ -10,13 +10,16 @@
 
 [
  (elseif_command)
- (elseif_command)
+ (else_command)
  (endif_command)
  (endforeach_command)
+ (endwhile_command)
  (endfunction_command)
  (endmacro_command)
  (endblock_command)
 ] @indent.branch
 
-(normal_command ")" @indent.branch)
-(normal_command ")" @indent.end)
+(")" @indent.branch)
+(")" @indent.end)
+
+(argument_list) @indent.auto