diff --git a/Default.sublime-keymap b/Default.sublime-keymap
index 3f1c2c7..e79b3f3 100644
--- a/Default.sublime-keymap
+++ b/Default.sublime-keymap
@@ -16,8 +16,9 @@
         },
         "context": [
             { "key": "selection_empty", "match_all": true },
-            { "key": "selector", "operand": "source.powershell - string", "match_all": true },
-            { "key": "preceding_text", "operator": "regex_contains", "operand": "@", "match_all": true },
+            { "key": "selector", "operand": "source.powershell - comment - string", "match_all": true },
+            { "key": "preceding_text", "operator": "regex_contains", "operand": "@$", "match_all": true },
+            { "key": "following_text", "operator": "not_regex_contains", "operand": "^[\"@]", "match_all": true },
         ]
     },
     {
@@ -37,8 +38,9 @@
         },
         "context": [
             { "key": "selection_empty", "match_all": true },
-            { "key": "selector", "operand": "source.powershell - string", "match_all": true },
-            { "key": "preceding_text", "operator": "regex_contains", "operand": "@", "match_all": true },
+            { "key": "selector", "operand": "source.powershell - comment - string", "match_all": true },
+            { "key": "preceding_text", "operator": "regex_contains", "operand": "@$", "match_all": true },
+            { "key": "following_text", "operator": "not_regex_contains", "operand": "^['@]", "match_all": true },
         ]
     },
 ]