diff --git a/src/sql/parts/grid/views/query/query.component.html b/src/sql/parts/grid/views/query/query.component.html
index b7a6124cc3..823ccd572d 100644
--- a/src/sql/parts/grid/views/query/query.component.html
+++ b/src/sql/parts/grid/views/query/query.component.html
@@ -22,6 +22,7 @@
 						enableAsyncPostRender="true"
 						showHeader="true"
 						[resized]="dataSet.resized"
+						(onActiveCellChanged)="onActiveCellChanged(i)"
 						(mousedown)="navigateToGrid(i)"
 						[selectionModel]="selectionModel"
 						[plugins]="plugins[i]"
diff --git a/src/sql/parts/grid/views/query/query.component.ts b/src/sql/parts/grid/views/query/query.component.ts
index 801ec01755..e35fcd2a4b 100644
--- a/src/sql/parts/grid/views/query/query.component.ts
+++ b/src/sql/parts/grid/views/query/query.component.ts
@@ -160,6 +160,7 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 	public queryPlanAvailable: EventEmitter<string> = new EventEmitter<string>();
 	public showChartRequested: EventEmitter<IGridDataSet> = new EventEmitter<IGridDataSet>();
 	public goToNextQueryOutputTabRequested: EventEmitter<void> = new EventEmitter<void>();
+	public onActiveCellChanged: (gridIndex: number) => void;
 
 	private savedViewState: {
 		gridSelections: ISlickRange[][];
@@ -266,6 +267,8 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 		self.complete = false;
 		self.activeGrid = 0;
 
+		this.onActiveCellChanged = this.onCellSelect;
+
 		// reset query plan info and send notification to subscribers
 		self.hasQueryPlan = false;
 		self.sentPlans = new Map<number, string>();
@@ -402,6 +405,10 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 		self.onScroll(0);
 	}
 
+	onCellSelect(gridIndex: number): void {
+		this.activeGrid = gridIndex;
+	}
+
 	openMessagesContextMenu(event: any): void {
 		let self = this;
 		event.preventDefault();