diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java
index e0de0c9d2f6..6b7f593f47f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java
@@ -143,8 +143,9 @@ public class VMViewerUpdate extends DsfExecutable implements IViewerUpdate {
             listDelta = listDelta.getParentDelta();
             elementList.add(0, listDelta.getElement());
         }
+        Object viewerInput = elementList.remove(0);
         fClientUpdate = new ClientUpdatePlaceHolder(
-            new TreePath(elementList.toArray()), elementList.get(0), presentationContext);
+            new TreePath(elementList.toArray()), viewerInput, presentationContext);
         fRequestMonitor = requestMonitor;
     }