diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
index fdabea9f6f12b54e1d5fc0b2655c5b4beef0ceb6..2c2c46b895a2bbdd79082329d50c021906d04959 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
@@ -43,6 +43,7 @@ export class NotebookFindWidget extends SimpleFindReplaceWidget implements INote
 	private _currentMatchDecorations: ICellModelDecorations[] = [];
 	private _showTimeout: number | null = null;
 	private _hideTimeout: number | null = null;
+	private _previousFocusElement?: HTMLElement;
 
 	constructor(
 		private readonly _notebookEditor: INotebookEditor,
@@ -65,6 +66,10 @@ export class NotebookFindWidget extends SimpleFindReplaceWidget implements INote
 		this._register(this._state.onFindReplaceStateChange(() => {
 			this.onInputChanged();
 		}));
+
+		this._register(DOM.addDisposableListener(this.getDomNode(), DOM.EventType.FOCUS, e => {
+			this._previousFocusElement = e.relatedTarget instanceof HTMLElement ? e.relatedTarget : undefined;
+		}, true));
 	}
 
 	private _onFindInputKeyDown(e: IKeyboardEvent): void {
@@ -167,6 +172,7 @@ export class NotebookFindWidget extends SimpleFindReplaceWidget implements INote
 	}
 
 	protected onFocusTrackerBlur() {
+		this._previousFocusElement = undefined;
 		this._findWidgetFocused.reset();
 	}
 
@@ -324,6 +330,11 @@ export class NotebookFindWidget extends SimpleFindReplaceWidget implements INote
 		} else {
 			// no op
 		}
+
+		if (this._previousFocusElement && this._previousFocusElement.offsetParent) {
+			this._previousFocusElement.focus();
+			this._previousFocusElement = undefined;
+		}
 	}
 
 	clear() {