diff --git a/.gitignore b/.gitignore
index d8cde8f9d7d9a..aab5678aabd83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,6 @@ errorShots
 examples/*/src-gen
 examples/*/gen-webpack.config.js
 examples/*/gen-webpack.node.config.js
-examples/*/.theia
-examples/*/.vscode
 examples/*/.test
 .browser_modules
 **/docs/api
diff --git a/.theia/settings.json b/.theia/settings.json
index 23199246981cf..822df91fdbcc4 100644
--- a/.theia/settings.json
+++ b/.theia/settings.json
@@ -1,5 +1,5 @@
 {
-  "editor.formatOnSave": true,
+  "editor.formatOnSave": false,
   "editor.insertSpaces": true,
   "[typescript]": {
     "editor.tabSize": 4
diff --git a/examples/api-tests/test-ts-workspace/.theia/settings.json b/examples/api-tests/test-ts-workspace/.theia/settings.json
deleted file mode 100644
index cefbf8c008acd..0000000000000
--- a/examples/api-tests/test-ts-workspace/.theia/settings.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "git.autoRepositoryDetection": true,
-  "git.openRepositoryInParentFolders": "always"
-}
\ No newline at end of file
diff --git a/examples/browser/.theia/settings.json b/examples/browser/.theia/settings.json
new file mode 100644
index 0000000000000..005b2ddfae9ac
--- /dev/null
+++ b/examples/browser/.theia/settings.json
@@ -0,0 +1,7 @@
+{
+    "files.autoSave": "afterDelay",
+    "workbench.editor.closeOnFileDelete": true,
+    "git.autoRepositoryDetection": true,
+    "git.openRepositoryInParentFolders": "always"
+}
+
diff --git a/examples/browser/.theia/tasks.json b/examples/browser/.theia/tasks.json
new file mode 100644
index 0000000000000..b37b3b4607ddf
--- /dev/null
+++ b/examples/browser/.theia/tasks.json
@@ -0,0 +1,3 @@
+{
+    "tasks": []
+}