diff --git a/src/vs/workbench/common/options.ts b/src/vs/workbench/common/options.ts
index 02c6033da83..14a7c16bd97 100644
--- a/src/vs/workbench/common/options.ts
+++ b/src/vs/workbench/common/options.ts
@@ -36,11 +36,6 @@ export interface IOptions {
 	 */
 	extensionsToInstall?: string[];
 
-	/**
-	 * A boolean flag indicating if the workbench is in file mode where some UI gets hidden. Does not override an existing setting by the user.
-	 */
-	singleFileMode?: boolean;
-
 	/**
 	 * Editor options to be used for any editor in the workbench.
 	 */
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
index 51ed4fadcc3..8951fa6837e 100644
--- a/src/vs/workbench/electron-browser/main.ts
+++ b/src/vs/workbench/electron-browser/main.ts
@@ -68,7 +68,6 @@ export function startup(configuration: IWindowConfiguration, globalSettings: IGl
 	const filesToCreate = configuration.filesToCreate && configuration.filesToCreate.length ? toInputs(configuration.filesToCreate) : null;
 	const filesToDiff = configuration.filesToDiff && configuration.filesToDiff.length ? toInputs(configuration.filesToDiff) : null;
 	const shellOptions: IOptions = {
-		singleFileMode: !configuration.workspacePath,
 		filesToOpen,
 		filesToCreate,
 		filesToDiff,
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index 43386162e8d..8a9ef24c667 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -394,7 +394,7 @@ export class Workbench implements IPartService {
 
 		// Sidebar visibility
 		this.sideBarHidden = this.storageService.getBoolean(Workbench.sidebarHiddenSettingKey, StorageScope.WORKSPACE, false);
-		if (!!this.workbenchParams.options.singleFileMode) {
+		if (!this.contextService.getWorkspace()) {
 			this.sideBarHidden = true; // we hide sidebar in single-file-mode
 		}
 
@@ -406,7 +406,7 @@ export class Workbench implements IPartService {
 		// Panel part visibility
 		const panelRegistry = (<PanelRegistry>Registry.as(PanelExtensions.Panels));
 		this.panelHidden = this.storageService.getBoolean(Workbench.panelHiddenSettingKey, StorageScope.WORKSPACE, true);
-		if (!!this.workbenchParams.options.singleFileMode || !panelRegistry.getDefaultPanelId()) {
+		if (!this.contextService.getWorkspace() || !panelRegistry.getDefaultPanelId()) {
 			this.panelHidden = true; // we hide panel part in single-file-mode or if there is no default panel
 		}