diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts
index ee9c9bf05e10c74c29bba5dffc6516f777898da4..9bceddf6b52bbc51a7ff3a6056a270af2e692c5b 100644
--- a/src/vs/platform/telemetry/common/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/common/telemetryUtils.ts
@@ -241,7 +241,6 @@ const configurationValueWhitelist = [
 	'php.validate.enable',
 	'php.validate.run',
 	'workbench.welcome.enabled',
-	'workbench.startupEditor',
 ];
 
 export function configurationTelemetry(telemetryService: ITelemetryService, configurationService: IConfigurationService): IDisposable {
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index 60d3d8f017c9256e6f4ee877d91ddefe3dd186a7..6f3e80c62eff1628c781e28bd1b9402fbc55a7aa 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -468,14 +468,7 @@ export class Workbench implements IPartService {
 	}
 
 	private openUntitledFile() {
-		const startupEditor = this.configurationService.lookup('workbench.startupEditor');
-		if (!startupEditor.user && !startupEditor.workspace) {
-			const welcomeEnabled = this.configurationService.lookup('workbench.welcome.enabled');
-			if (welcomeEnabled.value !== undefined && welcomeEnabled.value !== null) {
-				return !welcomeEnabled.value;
-			}
-		}
-		return startupEditor.value === 'newUntitledFile';
+		return !this.configurationService.lookup('workbench.welcome.enabled').value;
 	}
 
 	private initServices(): void {
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts
index b924959f0370e4bb95ff4f9b67f4466010ee8401..ad03774e188e45161cd1b94a6657a52492487333 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts
@@ -18,16 +18,10 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 		'order': 7,
 		'title': localize('workbenchConfigurationTitle', "Workbench"),
 		'properties': {
-			'workbench.startupEditor': {
-				'type': 'string',
-				'enum': ['none', 'welcomePage', 'newUntitledFile'],
-				'enumDescriptions': [
-					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.none' }, "Start without an editor."),
-					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page (default)."),
-					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.newUntitledFile' }, "Open a new untitled file."),
-				],
-				'default': 'welcomePage',
-				'description': localize('workbench.startupEditor', "Controls which editor is shown at startup, if none is restored from the previous session. Select 'none' to start without an editor, 'welcomePage' to open the Welcome page (default), 'newUntitledFile' to open a new untitled file (only when not opening a folder).")
+			'workbench.welcome.enabled': {
+				'type': 'boolean',
+				'default': true,
+				'description': localize('welcomePage.enabled', "When enabled, will show the Welcome page on startup.")
 			},
 		}
 	});
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
index 323050e6c26cf94b1173355b3672594e8ad96958..c49f0d522e438f0ea73234e98118ba1825931dd1 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
@@ -42,8 +42,7 @@ import { IStorageService } from "vs/platform/storage/common/storage";
 
 used();
 
-const configurationKey = 'workbench.startupEditor';
-const oldConfigurationKey = 'workbench.welcome.enabled';
+const configurationKey = 'workbench.welcome.enabled';
 const telemetryFrom = 'welcomePage';
 
 export class WelcomePageContribution implements IWorkbenchContribution {
@@ -77,14 +76,7 @@ export class WelcomePageContribution implements IWorkbenchContribution {
 }
 
 function isWelcomePageEnabled(configurationService: IConfigurationService) {
-	const startupEditor = configurationService.lookup(configurationKey);
-	if (!startupEditor.user && !startupEditor.workspace) {
-		const welcomeEnabled = configurationService.lookup(oldConfigurationKey);
-		if (welcomeEnabled.value !== undefined && welcomeEnabled.value !== null) {
-			return welcomeEnabled.value;
-		}
-	}
-	return startupEditor.value === 'welcomePage';
+	return configurationService.lookup(configurationKey).value;
 }
 
 export class WelcomePageAction extends Action {
@@ -217,7 +209,7 @@ class WelcomePage {
 			showOnStartup.setAttribute('checked', 'checked');
 		}
 		showOnStartup.addEventListener('click', e => {
-			this.configurationEditingService.writeConfiguration(ConfigurationTarget.USER, { key: configurationKey, value: showOnStartup.checked ? 'welcomePage' : 'newUntitledFile' });
+			this.configurationEditingService.writeConfiguration(ConfigurationTarget.USER, { key: configurationKey, value: showOnStartup.checked });
 		});
 
 		recentlyOpened.then(({ folders }) => {