diff --git a/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml b/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml
index 62cf699a7..ec56b84df 100644
--- a/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml
+++ b/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml
@@ -93,11 +93,11 @@ injections:
     patterns:
     # Matches the store accessor symbol.
     # i.e. the `$` in `$myStore`.
-    - match: (?<![_$[:alnum:]])\$(?=[_[:alpha:]][_$[:alnum:]]*)
+    - match: (?<![_$./'"[:alnum:]])\$(?=[_[:alpha:]][_$[:alnum:]]*)
       name: punctuation.definition.variable.svelte
     # Matches the built-in constants/keywords that Svelte supports.
     # e.g. `$$restProps`.
-    - match: (?<![_$[:alnum:]])(\$\$)(?=props|restProps|slots)
+    - match: (?<![_$./'"[:alnum:]])(\$\$)(?=props|restProps|slots)
       name: punctuation.definition.variable.svelte
 
   # - PUG -
diff --git a/packages/svelte-vscode/test/grammar/samples/store/input.svelte b/packages/svelte-vscode/test/grammar/samples/store/input.svelte
new file mode 100644
index 000000000..1a7862678
--- /dev/null
+++ b/packages/svelte-vscode/test/grammar/samples/store/input.svelte
@@ -0,0 +1,7 @@
+<script>
+import './$types';
+import '$lib/foo';
+$bar;
+</script>
+
+{$bar}
diff --git a/packages/svelte-vscode/test/grammar/samples/store/input.svelte.snap b/packages/svelte-vscode/test/grammar/samples/store/input.svelte.snap
new file mode 100644
index 000000000..b7611c7a8
--- /dev/null
+++ b/packages/svelte-vscode/test/grammar/samples/store/input.svelte.snap
@@ -0,0 +1,22 @@
+><script>
+#^ source.svelte meta.script.svelte meta.tag.start.svelte punctuation.definition.tag.begin.svelte
+# ^^^^^^ source.svelte meta.script.svelte meta.tag.start.svelte entity.name.tag.svelte
+#       ^ source.svelte meta.script.svelte meta.tag.start.svelte punctuation.definition.tag.end.svelte
+>import './$types';
+#^^^^^^^^^^^^^^^^^^^ source.svelte meta.script.svelte meta.embedded.block.svelte source.js
+>import '$lib/foo';
+#^^^^^^^^^^^^^^^^^^^ source.svelte meta.script.svelte meta.embedded.block.svelte source.js
+>$bar;
+#^ source.svelte meta.script.svelte meta.embedded.block.svelte source.js punctuation.definition.variable.svelte
+# ^^^^^ source.svelte meta.script.svelte meta.embedded.block.svelte source.js
+></script>
+#^^ source.svelte meta.script.svelte meta.tag.end.svelte punctuation.definition.tag.begin.svelte
+#  ^^^^^^ source.svelte meta.script.svelte meta.tag.end.svelte entity.name.tag.svelte
+#        ^ source.svelte meta.script.svelte meta.tag.end.svelte punctuation.definition.tag.end.svelte
+>
+>{$bar}
+#^ source.svelte punctuation.section.embedded.begin.svelte
+# ^ source.svelte meta.embedded.expression.svelte source.ts punctuation.definition.variable.svelte
+#  ^^^ source.svelte meta.embedded.expression.svelte source.ts
+#     ^ source.svelte punctuation.section.embedded.end.svelte
+>
\ No newline at end of file