diff --git a/.gitignore b/.gitignore
index 3e528e79409762..6c6e7832fd1c1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,8 +146,11 @@ vendor/
 /packages/react-native/sdks/hermesc
 /packages/react-native/sdks/hermes-engine/hermes-engine-from-local-source-dir.tar.gz
 
-# Visual studio
-.vscode
+# Visual Studio Code (config dir - if present, this merges user defined
+# workspace settings on top of react-native.code-workspace)
+/.vscode
+
+# Visual Studio
 .vs
 
 # Android memory profiler files
diff --git a/.prettierrc b/.prettierrc
index 7ea6b136ed774f..9a77c6d517178b 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -7,6 +7,12 @@
   "trailingComma": "all",
   "endOfLine": "lf",
   "overrides": [
+    {
+      "files": ["*.code-workspace"],
+      "options": {
+        "parser": "json"
+      }
+    },
     {
       "files": [
         "*.js",
diff --git a/react-native.code-workspace b/react-native.code-workspace
index 7a10adaad04212..77a7bea1621aee 100644
--- a/react-native.code-workspace
+++ b/react-native.code-workspace
@@ -1,20 +1,20 @@
 {
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"extensions": {
-		"recommendations": [
-			"dbaeumer.vscode-eslint",
-			"editorconfig.editorconfig",
-			"esbenp.prettier-vscode",
-			"flowtype.flow-for-vscode"
-		],
-	},
-	"settings": {
-		"editor.formatOnSave": true,
-		"flow.pathToFlow": "${workspaceFolder}/node_modules/.bin/flow",
-		"javascript.validate.enable": false
-	}
+  "folders": [
+    {
+      "path": "."
+    }
+  ],
+  "extensions": {
+    "recommendations": [
+      "dbaeumer.vscode-eslint",
+      "editorconfig.editorconfig",
+      "esbenp.prettier-vscode",
+      "flowtype.flow-for-vscode"
+    ]
+  },
+  "settings": {
+    "editor.formatOnSave": true,
+    "flow.pathToFlow": "${workspaceFolder}/node_modules/.bin/flow",
+    "javascript.validate.enable": false
+  }
 }