From 6729fbbc861ece871549026a0a64f3aff2302445 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Sun, 21 Nov 2021 08:53:14 -0800
Subject: [PATCH] only focus when showing panel if active instance is not an
 extHost terminal

---
 src/vs/workbench/contrib/terminal/browser/terminalView.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index d2f42f47998..596a05c71e9 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -137,7 +137,6 @@ export class TerminalViewPane extends ViewPane {
 					if (this._terminalsInitialized) {
 						if (!hadTerminals) {
 							this._terminalService.createTerminal({ location: TerminalLocation.Panel });
-							this._terminalGroupService.showPanel(true);
 						}
 					} else {
 						this._terminalsInitialized = true;
@@ -146,6 +145,11 @@ export class TerminalViewPane extends ViewPane {
 				} else {
 					this._onDidChangeViewWelcomeState.fire();
 				}
+				if (!this._terminalService.activeInstance?.shellLaunchConfig.extHostTerminalId) {
+					// showPanel is already called with !preserveFocus
+					// when extension host terminals are created
+					this._terminalGroupService.showPanel(true);
+				}
 
 				if (hadTerminals) {
 					this._terminalGroupService.activeGroup?.setVisible(visible);