fixed the terminal and find widget key presses

microsoft · Sep 7, 2017 · f07043b · f07043b
1 parent ae2b0eb
commit f07043b
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -407,10 +407,8 @@ export class TerminalInstance implements ITerminalInstance {
 	}
 
 	public notifyFindWidgetFocusChanged(isFocused: boolean): void {
-		// In order to support escape to close the find widget when the terminal
-		// is focused terminalFocus needs to be true when either the terminal or
-		// the find widget are focused.
-		this._terminalFocusContextKey.set(isFocused || document.activeElement === this._xterm.textarea);
+		const terminalFocused = !isFocused && (document.activeElement === this._xterm.textarea || document.activeElement === this._xterm.element);
+		this._terminalFocusContextKey.set(terminalFocused);
 	}
 
 	public dispose(): void {