diff --git a/src/sql/parts/grid/views/gridParentComponent.ts b/src/sql/parts/grid/views/gridParentComponent.ts
index 45108be9bd..c9422a84bf 100644
--- a/src/sql/parts/grid/views/gridParentComponent.ts
+++ b/src/sql/parts/grid/views/gridParentComponent.ts
@@ -477,7 +477,13 @@ export abstract class GridParentComponent {
 	 */
 	xmlLinkHandler = (cellRef: string, row: number, dataContext: JSON, colDef: any) => {
 		const self = this;
-		self.handleLink(cellRef, row, dataContext, colDef, 'xml');
+
+		let value = self.getCellValueString(dataContext, colDef);
+		if (value.startsWith('<ShowPlanXML') && colDef.name !== 'XML Showplan') {
+			self.handleQueryPlanLink(cellRef, value);
+		} else {
+			self.handleLink(cellRef, row, dataContext, colDef, 'xml');
+		}
 	}
 
 	/**
@@ -488,6 +494,13 @@ export abstract class GridParentComponent {
 		self.handleLink(cellRef, row, dataContext, colDef, 'json');
 	}
 
+	private handleQueryPlanLink(cellRef: string, value: string): void {
+		const self = this;
+		$(cellRef).children('.xmlLink').click(function (): void {
+			self._bootstrapService.queryEditorService.newQueryPlanEditor(value);
+		});
+	}
+
 	private handleLink(cellRef: string, row: number, dataContext: JSON, colDef: any, linkType: string): void {
 		const self = this;
 		let value = self.getCellValueString(dataContext, colDef);