diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/suggestEnabledInput.ts b/src/vs/workbench/parts/codeEditor/electron-browser/suggestEnabledInput.ts
index 4c4340a3db9784e4fc727f28dea61a661ce57004..8c692b4fcc2f705c5d6889360a8304efb6e56032 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/suggestEnabledInput.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/suggestEnabledInput.ts
@@ -196,6 +196,8 @@ export class SuggestEnabledInput extends Widget implements IThemable {
 		}));
 	}
 
+	public get onFocus(): Event<void> { return this.inputWidget.onDidFocusEditorText; }
+
 	public setValue(val: string) {
 		val = val.replace(/\s/g, ' ');
 		const fullRange = new Range(1, 1, 1, this.getValue().length + 1);
diff --git a/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts
index 9f52f2b6459c4c7bf0b8f35b99850bd477b741c7..b177f2ce4f0ff47d485297c15ab09944bba4c60f 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts
@@ -370,6 +370,10 @@ export class SettingsEditor2 extends BaseEditor {
 			})
 		);
 
+		this._register(this.searchWidget.onFocus(() => {
+			this.lastFocusedSettingElement = '';
+		}));
+
 		this._register(attachSuggestEnabledInputBoxStyler(this.searchWidget, this.themeService, {
 			inputBorder: settingsTextInputBorder
 		}));