diff --git a/queries/go/folds.scm b/queries/go/folds.scm
index c79d45720..fef75cd8e 100644
--- a/queries/go/folds.scm
+++ b/queries/go/folds.scm
@@ -9,5 +9,6 @@
  (method_declaration)
  (type_declaration)
  (var_declaration)
+ (block)
 ] @fold
 
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index ccd094f2f..2666602ac 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -38,6 +38,9 @@
 (method_declaration
   name: (field_identifier) @method)
 
+(method_spec 
+  name: (field_identifier) @method) 
+
 ; Operators
 
 [