diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
index 3c6d3101f52714aa6461e392dd99b795f9679858..722808a599dda6d591d4c7dfa8b16bac4439cd12 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
@@ -248,10 +248,7 @@ export class SearchEditor extends BaseTextEditor {
 	}
 
 	focusSearchInput() {
-		const viewState = this.loadViewState();
-		if (viewState && viewState.focused === 'editor') {
-			this.queryEditorWidget.searchInput.focus();
-		}
+		this.queryEditorWidget.searchInput.focus();
 	}
 
 	focusNextInput() {
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
index 5b8ef7fef9cb48f25573cfd79537d2f571b01487..ae912bdd0bcb23dcd45a406cd0b475d487789286 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
@@ -161,7 +161,7 @@ export class RerunSearchEditorSearchAction extends Action {
 
 export class FocusQueryEditorWidgetAction extends Action {
 	static readonly ID: string = Constants.FocusQueryEditorWidgetCommandId;
-	static readonly LABEL = localize('search.action.focusQueryEditorWidget', "Focus Query Editor Widget");
+	static readonly LABEL = localize('search.action.focusQueryEditorWidget', "Focus Search Editor Input");
 
 	constructor(id: string, label: string,
 		@IEditorService private readonly editorService: IEditorService,