diff --git a/.gitignore b/.gitignore
index e1f9e47b924..ea631c97ba0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,6 @@ tests/system/settingsCache/*
 !tests/system/settingsCache/2020.4/*.txt
 source/locale/en/LC_MESSAGES/nvda.po
 source/locale/*/cldr.dic
-.vscode
 .vs
 .venv
 nvdaHelper/docs/
diff --git a/.gitmodules b/.gitmodules
index a006510f0b7..c68030bdf86 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -38,3 +38,6 @@
 	url = https://github.com/nvaccess/nvda-cldr.git
 	branch = main-out
 	shallow = true
+[submodule ".vscode"]
+	path = .vscode
+	url = https://github.com/nvaccess/vscode-nvda.git
diff --git a/.vscode b/.vscode
new file mode 160000
index 00000000000..82364e4dd11
--- /dev/null
+++ b/.vscode
@@ -0,0 +1 @@
+Subproject commit 82364e4dd110ce8ea9c19cafb3707171ef84dda1