diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index ce4ae89b6..f2bdf6a83 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -15,9 +15,6 @@
 
 (label_name) @label
 
-((identifier) @constant
- (#eq? @constant "_"))
-
 (const_spec
   name: (identifier) @constant)
 
@@ -41,6 +38,14 @@
 (method_spec 
   name: (field_identifier) @method) 
 
+; Constructors
+
+((call_expression (identifier) @constructor)
+  (#lua-match? @constructor "^[nN]ew.+$"))
+
+((call_expression (identifier) @constructor)
+  (#lua-match? @constructor "^[mM]ake.+$"))
+
 ; Operators
 
 [