diff --git a/src/sql/workbench/parts/query/browser/queryResultsView.ts b/src/sql/workbench/parts/query/browser/queryResultsView.ts
index 6ba1cbd938..ff4195143b 100644
--- a/src/sql/workbench/parts/query/browser/queryResultsView.ts
+++ b/src/sql/workbench/parts/query/browser/queryResultsView.ts
@@ -223,15 +223,13 @@ export class QueryResultsView extends Disposable {
 			this.input.state.visibleTabs = new Set();
 			this.input.state.activeTab = this.resultsTab.identifier;
 		}));
-		this.runnerDisposables.push(runner.onMessage(e => {
-			if (e.isError) {
-				this._panelView.showTab(this.messagesTab.identifier);
-			}
-		}));
 		this.runnerDisposables.push(runner.onQueryEnd(() => {
 			if (!this.hasResults(runner)) {
 				this.hideResults();
 			}
+			if (runner.messages.find(v => v.isError)) {
+				this._panelView.showTab(this.messagesTab.identifier);
+			}
 		}));
 
 		if (this.input.state.visibleTabs.has(this.chartTab.identifier) && !this._panelView.contains(this.chartTab)) {