diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index 0f9be0483..32c6c2cbc 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -113,6 +113,12 @@
   "type"
 ] @keyword
 
+[
+  "defer"
+  "go"
+  "goto"
+] @keyword.control
+
 [
   "if"  
   "else"
@@ -154,12 +160,6 @@
   "const"
 ] @keyword.storage.modifier
 
-[
-  "defer"
-  "goto"
-  "go"
-] @function.macro
-
 ; Delimiters
 
 [