diff --git a/.gitignore b/.gitignore
index e159238..1679ca7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Gitignore settings for ESPHome
 # This is an example and may include too much for your use-case.
 # You can modify this file to suit your needs.
+**/.vscode/
 **/.esphome/
 **/.pioenvs/
 **/.piolibdeps/
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..a68b3cc
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "*.yaml": "esphome"
+    }
+}
\ No newline at end of file