diff --git a/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts b/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts
index b610b2fcac..32427c4e1c 100644
--- a/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts
+++ b/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts
@@ -53,9 +53,13 @@ export class NodeContextKey extends Disposable implements IContextKey<INodeConte
 			this._connectedKey.set(false);
 			this._connectionContextKey.reset();
 		}
+		if (value.node) {
+			this._viewItemKey.set(value.node.contextValue);
+		} else {
+			this._viewItemKey.reset();
+		}
 		this._nodeContextKey.set(value);
 		this._viewIdKey.set(value.viewId);
-		this._viewItemKey.set(value.node.contextValue);
 	}
 
 	reset(): void {