diff --git a/src/vs/workbench/parts/output/browser/outputActions.ts b/src/vs/workbench/parts/output/browser/outputActions.ts
index b7e0927a94b8e13c8ede23d624431b5e70a44bd6..f083d763cbc62a0fab7c7421ecaebf589f45263b 100644
--- a/src/vs/workbench/parts/output/browser/outputActions.ts
+++ b/src/vs/workbench/parts/output/browser/outputActions.ts
@@ -112,7 +112,10 @@ export class SwitchOutputActionItem extends SelectActionItem {
 	) {
 		super(null, action, [], 0);
 
-		this.toDispose.push(this.outputService.onOutputChannel(() => this.setOptions(this.getOptions(), this.getSelected(undefined))));
+		this.toDispose.push(this.outputService.onOutputChannel(() => {
+			const activeChannelIndex = this.getSelected(this.outputService.getActiveChannel().id);
+			this.setOptions(this.getOptions(), activeChannelIndex);
+		}));
 		this.toDispose.push(this.outputService.onActiveOutputChannel(activeChannelId => this.setOptions(this.getOptions(), this.getSelected(activeChannelId))));
 		this.toDispose.push(attachSelectBoxStyler(this.selectBox, themeService));