diff --git a/extensions/go/language-configuration.json b/extensions/go/language-configuration.json
index 2bdc2752749..ad1e433dd82 100644
--- a/extensions/go/language-configuration.json
+++ b/extensions/go/language-configuration.json
@@ -12,9 +12,9 @@
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
-		["\"", "\""],
-		["'", "'"],
-		["`", "`"]
+		{ "open": "`", "close": "`", "notIn": ["string"]},
+		{ "open": "\"", "close": "\"", "notIn": ["string"]},
+		{ "open": "'", "close": "'", "notIn": ["string", "comment"]}
 	],
 	"surroundingPairs": [
 		["{", "}"],