diff --git a/src/sql/workbench/contrib/executionPlan/browser/executionPlanFileView.ts b/src/sql/workbench/contrib/executionPlan/browser/executionPlanFileView.ts
index ef7d4c811b..b7a9d258e6 100644
--- a/src/sql/workbench/contrib/executionPlan/browser/executionPlanFileView.ts
+++ b/src/sql/workbench/contrib/executionPlan/browser/executionPlanFileView.ts
@@ -41,7 +41,7 @@ export class ExecutionPlanFileView {
 	}
 
 	public onHide(parentContainer: HTMLElement): void {
-		if (parentContainer === this._parent) {
+		if (parentContainer === this._parent && parentContainer.contains(this._container)) {
 			this._parent.removeChild(this._container);
 		}
 	}
diff --git a/src/sql/workbench/contrib/executionPlan/browser/executionPlanTab.ts b/src/sql/workbench/contrib/executionPlan/browser/executionPlanTab.ts
index 3e4331c671..28a68b7c26 100644
--- a/src/sql/workbench/contrib/executionPlan/browser/executionPlanTab.ts
+++ b/src/sql/workbench/contrib/executionPlan/browser/executionPlanTab.ts
@@ -84,6 +84,7 @@ export class ExecutionPlanTabView implements IPanelView {
 			currentView.onHide(this._container);
 			this._input.graphs = [];
 			currentView = this._instantiationService.createInstance(ExecutionPlanFileView);
+			this._viewCache.executionPlanFileViewMap.set(this._input.executionPlanFileViewUUID, currentView);
 			currentView.render(this._container);
 		}
 	}