diff --git a/.vscode/settings.json b/.vscode/settings.json
index ea091db77..c2d8ff8bd 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,6 +5,7 @@
   "eslint.packageManager": "yarn",
   "eslint.codeActionsOnSave.mode": "all",
   "editor.formatOnSave": true,
+  "files.eol": "\n",
   "editor.codeActionsOnSave": {
     "source.fixAll": true
   },
diff --git a/desktop/.vscode/settings.json b/desktop/.vscode/settings.json
new file mode 100644
index 000000000..c2d8ff8bd
--- /dev/null
+++ b/desktop/.vscode/settings.json
@@ -0,0 +1,29 @@
+{
+  "eslint.enable": true,
+  "eslint.format.enable": true,
+  "eslint.lintTask.enable": true,
+  "eslint.packageManager": "yarn",
+  "eslint.codeActionsOnSave.mode": "all",
+  "editor.formatOnSave": true,
+  "files.eol": "\n",
+  "editor.codeActionsOnSave": {
+    "source.fixAll": true
+  },
+  "eslint.workingDirectories": [
+    {
+      "mode": "auto"
+    }
+  ],
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  }
+}