diff --git a/.gitignore b/.gitignore
index a975576e00..a85dbc65f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@ app/public/styles/*.css
 venv/
 
 # Frontend
-.vscode/
 .awcache/
 .dist/
 npm-debug.log
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000000..466edfad19
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,13 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+
+	// List of extensions which should be recommended for users of this workspace.
+	"recommendations": [
+		"eamodio.gitlens"
+	],
+	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+	"unwantedRecommendations": [
+		
+	]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..6267a50318
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,9 @@
+{
+    "[html]": {
+        "editor.tabSize": 4
+    },
+    "[javascript][javascriptreact][typescript][typescriptreact]": {
+        "editor.detectIndentation": false,
+        "editor.tabSize": 2
+    },
+}
\ No newline at end of file