diff --git a/.gitignore b/.gitignore
index 72fd117bd2..191dd65ed9 100755
--- a/.gitignore
+++ b/.gitignore
@@ -141,11 +141,8 @@ __vm/
 vc-fileutils.settings
 
 # Visual Studio Code
-.vscode
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/*.db
+.vscode/*
+!.vscode/extensions.json
 
 #Simulation
 imgui.ini
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000000..7226831cb1
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,8 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "marlinfirmware.auto-build",
+        "platformio.platformio-ide"
+    ]
+}