diff --git a/.changeset/four-pens-worry.md b/.changeset/four-pens-worry.md
new file mode 100644
index 000000000000..ccaf073698fd
--- /dev/null
+++ b/.changeset/four-pens-worry.md
@@ -0,0 +1,5 @@
+---
+'astro-vscode': patch
+---
+
+Improves astro file templates to be scoped to `.astro` file extensions
diff --git a/packages/language-tools/vscode/README.md b/packages/language-tools/vscode/README.md
index 85199f3fe523..c0b8933c4b7f 100644
--- a/packages/language-tools/vscode/README.md
+++ b/packages/language-tools/vscode/README.md
@@ -18,6 +18,7 @@ Provides language support for `.astro` files. This extension is powered by the [
 - [Go to Definition](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-definition), [Go to Type Definition](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-type-definition), [Go to Implementation](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-implementation) etc
 - [Inlay hints](https://code.visualstudio.com/docs/editor/editingevolved#_inlay-hints)
 - [Code folding](https://code.visualstudio.com/docs/editor/codebasics#_folding)
+- [Snippets & File Templates](https://code.visualstudio.com/docs/editing/userdefinedsnippets)
 - and more!
 
 A TypeScript plugin adding support for importing and exporting Astro components inside JavaScript and TypeScript files is also included.
diff --git a/packages/language-tools/vscode/languages/astro.code-snippets b/packages/language-tools/vscode/languages/astro.code-snippets
index 1004bf35bcac..7321fd49b44a 100644
--- a/packages/language-tools/vscode/languages/astro.code-snippets
+++ b/packages/language-tools/vscode/languages/astro.code-snippets
@@ -21,6 +21,7 @@
 			"</html>",
 		],
 		"description": "Page with full HTML",
+		"include": "*.astro",
 	},
 	"page_layout": {
 		"prefix": "page_layout",
@@ -36,6 +37,7 @@
 			"</$1>",
 		],
 		"description": "Page from Layout",
+		"include": "*.astro",
 	},
 	"component": {
 		"prefix": "component",
@@ -43,5 +45,6 @@
 		"scope": "astro",
 		"body": ["---", "$1", "---", "", "$0"],
 		"description": "Component",
+		"include": "*.astro",
 	},
 }