diff --git a/src/vs/workbench/browser/actions/openSettings.ts b/src/vs/workbench/browser/actions/openSettings.ts
index 45117385212..c0798128799 100644
--- a/src/vs/workbench/browser/actions/openSettings.ts
+++ b/src/vs/workbench/browser/actions/openSettings.ts
@@ -28,7 +28,7 @@ import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
 import {KeyMod, KeyCode} from 'vs/base/common/keyCodes';
 
-export interface IWorkbenchSettingsConfiguration {
+interface IWorkbenchSettingsConfiguration {
 	workbench: {
 		settings: {
 			openDefaultSettings: boolean;
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index 3c3e2e74915..31b66027b47 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -48,6 +48,14 @@ interface IPickOpenEntryItem extends IPickOpenEntry {
 	render?: (tree: ITree, container: HTMLElement, previousCleanupFn: IElementCallback) => IElementCallback;
 }
 
+interface IWorkbenchQuickOpenConfiguration {
+	workbench: {
+		quickOpen: {
+			closeOnFocusLost: boolean;
+		}
+	};
+}
+
 interface IInternalPickOptions {
 	value?: string;
 	valueSelect?: boolean;
@@ -82,6 +90,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
 	private actionProvider = new ContributableActionProvider();
 	private previousValue = '';
 	private visibilityChangeTimeoutHandle: number;
+	private closeOnFocusLost: boolean;
 
 	constructor(
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
@@ -89,6 +98,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IContextKeyService contextKeyService: IContextKeyService,
+		@IConfigurationService private configurationService: IConfigurationService,
 		@IHistoryService private historyService: IHistoryService,
 		@IInstantiationService private instantiationService: IInstantiationService
 	) {
@@ -102,6 +112,18 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
 
 		this._onShow = new Emitter<void>();
 		this._onHide = new Emitter<void>();
+
+		this.updateConfiguration(<IWorkbenchQuickOpenConfiguration>this.configurationService.getConfiguration());
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		this.configurationService.onDidUpdateConfiguration(e => this.updateConfiguration(e.config));
+	}
+
+	private updateConfiguration(settings: IWorkbenchQuickOpenConfiguration): void {
+		this.closeOnFocusLost = settings.workbench.quickOpen.closeOnFocusLost;
 	}
 
 	public get onShow(): Event<void> {
@@ -325,7 +347,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
 						complete(selectedPick || null);
 					},
 					onCancel: () => complete(void 0),
-					onFocusLost: () => options.ignoreFocusLost,
+					onFocusLost: () => !this.closeOnFocusLost || options.ignoreFocusLost,
 					onType: (value: string) => {
 
 						// the caller takes care of all input
@@ -455,7 +477,8 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
 					onCancel: () => { /* ignore */ },
 					onType: (value: string) => this.onType(value || ''),
 					onShow: () => this.handleOnShow(false),
-					onHide: (reason) => this.handleOnHide(false, reason)
+					onHide: (reason) => this.handleOnHide(false, reason),
+					onFocusLost: () => !this.closeOnFocusLost
 				}, {
 					inputPlaceHolder: this.hasHandler(HELP_PREFIX) ? nls.localize('quickOpenInput', "Type '?' to get help on the actions you can take from here") : ''
 				},
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index 7291c1306be..7bdcc44946a 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -83,6 +83,11 @@ configurationRegistry.registerConfiguration({
 			'default': 'right',
 			'description': nls.localize('editorOpenPositioning', "Controls where editors open. Select 'left' or 'right' to open editors to the left or right of the current active one. Select 'first' or 'last' to open editors independently from the currently active one.")
 		},
+		'workbench.quickOpen.closeOnFocusLost': {
+			'type': 'boolean',
+			'description': nls.localize('closeOnFocusLost', "Controls if quick open should close automatically once it looses focus."),
+			'default': true
+		},
 		'workbench.settings.openDefaultSettings': {
 			'type': 'boolean',
 			'description': nls.localize('openDefaultSettings', "Controls if opening settings also opens an editor showing all default settings."),