diff --git a/queries/go/indents.scm b/queries/go/indents.scm
index b26811c83..a4fea2721 100644
--- a/queries/go/indents.scm
+++ b/queries/go/indents.scm
@@ -12,10 +12,21 @@
   (block)
   (call_expression)
   (parameter_list)
-  (struct_type)
+  (field_declaration_list)
+  (interface_type)
 ] @indent.begin
 
-"}" @indent.branch
+(literal_value
+  "}" @indent.branch)
+
+(block
+  "}" @indent.branch)
+
+(field_declaration_list
+  "}" @indent.branch)
+
+(interface_type
+  "}" @indent.branch)
 
 (const_declaration
   ")" @indent.branch)