diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index 64120e14a..28342e3c1 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -79,7 +79,10 @@
   "wincmd"
 ] @keyword
 (map_statement cmd: _ @keyword)
-(command_name) @function.macro
+[ 
+  (command_name)
+  (unknown_command_name)
+]@function.macro
 
 ;; Syntax command