diff --git a/queries/graphql/highlights.scm b/queries/graphql/highlights.scm
index cedf8e113..3a9d47dad 100644
--- a/queries/graphql/highlights.scm
+++ b/queries/graphql/highlights.scm
@@ -19,12 +19,6 @@
 (input_object_type_definition
   (name) @type)
 
-(directive_definition
-  (name) @type)
-
-(directive_definition
-  "@" @type)
-
 (scalar_type_extension
   (name) @type)
 
@@ -46,7 +40,14 @@
 (named_type
   (name) @type)
 
-(directive) @type
+; Directives
+;-----------
+
+(directive_definition
+  "@" @attribute
+  (name) @attribute)
+
+(directive) @attribute
 
 ; Properties
 ;-----------