diff --git a/queries/glsl/highlights.scm b/queries/glsl/highlights.scm
index af2a049fb..4e5e57f47 100644
--- a/queries/glsl/highlights.scm
+++ b/queries/glsl/highlights.scm
@@ -25,11 +25,11 @@
   "noperspective"
   "invariant"
   "precise"
-] @keyword
+] @type.qualifier
 
 "subroutine" @keyword.function
 
-(extension_storage_class) @attribute
+(extension_storage_class) @storageclass
 
 (
   (identifier) @variable.builtin