diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 57009aea3..06801747b 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -30,7 +30,8 @@
   (#match? @type "^[A-Z]"))
 ((identifier) @constant
   (#match? @constant "^[A-Z][A-Z_0-9]*$"))
-((identifier) @type . ".")
+((identifier) @type
+  (#match? @type "^[A-Z][A-Z_0-9]*$") . (_))
 
 ((attribute
     (identifier) @field)