diff --git a/.vscode/settings.json b/.vscode/settings.json
index 221b32fe419..4a376d81607 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -165,11 +165,10 @@
 		"src/vs/workbench/workbench.web.main.ts",
 		"src/vs/workbench/api/common/extHostTypes.ts"
 	],
-
 	// Temporarily enabled for self-hosting
 	"terminal.integrated.stickyScroll.enabled": true,
-
 	// Temporarily enabled for self-hosting
 	"scm.showIncomingChanges": "always",
-	"scm.showOutgoingChanges": "always"
+	"scm.showOutgoingChanges": "always",
+	"workbench.editor.showTabs": "multiple",
 }
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index 198ebc96fa4..a0c22da313c 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -817,17 +817,21 @@ Registry.as<IConfigurationMigrationRegistry>(Extensions.ConfigurationMigration)
 Registry.as<IConfigurationMigrationRegistry>(Extensions.ConfigurationMigration)
 	.registerConfigurationMigrations([{
 		key: 'workbench.editor.doubleClickTabToToggleEditorGroupSizes', migrateFn: (value: any) => {
+			const results: ConfigurationKeyValuePairs = [];
 			if (typeof value === 'boolean') {
 				value = value ? 'expand' : 'off';
+				results.push(['workbench.editor.doubleClickTabToToggleEditorGroupSizes', { value }]);
 			}
-			return [['workbench.editor.doubleClickTabToToggleEditorGroupSizes', { value: value }]];
+			return results;
 		}
 	}, {
 		key: LayoutSettings.EDITOR_TABS_MODE, migrateFn: (value: any) => {
+			const results: ConfigurationKeyValuePairs = [];
 			if (typeof value === 'boolean') {
 				value = value ? EditorTabsMode.MULTIPLE : EditorTabsMode.SINGLE;
+				results.push([LayoutSettings.EDITOR_TABS_MODE, { value }]);
 			}
-			return [[LayoutSettings.EDITOR_TABS_MODE, { value }]];
+			return results;
 		}
 	}, {
 		key: 'workbench.editor.tabCloseButton', migrateFn: (value: any) => {