1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFChildrenContextQuery.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFChildrenContextQuery.java
index 4e3a65e89..506266f9f 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFChildrenContextQuery.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFChildrenContextQuery.java
@@ -66,8 +66,8 @@ public class TCFChildrenContextQuery extends TCFChildren {
             if (isValid()) return true; // error creating a node
             TCFNode n = model.getNode(id);
             while (n != null) {
-                if (n.parent == node) {
-                    set.add(id);
+                if (n.parent == node || (n.parent == null && !(node instanceof TCFNodeExecContext))) {
+                    set.add(n.getID());
                     break;
                 }
                 n = n.parent;