diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000000..ec1feb2198c5
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*.json]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 7aeb084ce335..d4550a2026f8 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,5 +1,6 @@
 {
     "recommendations": [
+        "EditorConfig.EditorConfig",
         "vscode-docs-authoring"
     ]
 }