diff --git a/src/vs/workbench/contrib/debug/browser/variablesView.ts b/src/vs/workbench/contrib/debug/browser/variablesView.ts
index 01aac2fa..b067608b 100644
--- a/src/vs/workbench/contrib/debug/browser/variablesView.ts
+++ b/src/vs/workbench/contrib/debug/browser/variablesView.ts
@@ -171,7 +171,7 @@ export class VariablesView extends ViewPane {
 			}
 		}));
 		this._register(this.debugService.getViewModel().onDidEvaluateLazyExpression(async e => {
-			if (e instanceof Variable) {
+			if (e instanceof Variable && this.tree.hasNode(e)) {
 				await this.tree.updateChildren(e, false, true);
 				await this.tree.expand(e);
 			}
@@ -470,7 +470,7 @@ class VariablesAccessibilityProvider implements IListAccessibilityProvider<IExpr
 	}
 }
 
-export const SET_VARIABLE_ID = 'debug.setVariable';
+export const SET_VARIABLE_ID = 'debug.setVariable.context';
 CommandsRegistry.registerCommand({
 	id: SET_VARIABLE_ID,
 	handler: (accessor: ServicesAccessor) => {