diff --git a/org.eclipse.handly.ui/src/org/eclipse/handly/ui/callhierarchy/CallHierarchyViewPart.java b/org.eclipse.handly.ui/src/org/eclipse/handly/ui/callhierarchy/CallHierarchyViewPart.java
index f6eb6d2..46518c8 100644
--- a/org.eclipse.handly.ui/src/org/eclipse/handly/ui/callhierarchy/CallHierarchyViewPart.java
+++ b/org.eclipse.handly.ui/src/org/eclipse/handly/ui/callhierarchy/CallHierarchyViewPart.java
@@ -90,6 +90,7 @@
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 import org.eclipse.ui.part.PageBook;
 import org.eclipse.ui.part.ViewPart;
+import org.eclipse.ui.progress.PendingUpdateAdapter;
 
 /**
  * An abstract base implementation of a call hierarchy view.
@@ -1535,7 +1536,13 @@
         @Override
         protected boolean updateSelection(IStructuredSelection selection)
         {
-            return !selection.isEmpty();
+            if (selection.isEmpty())
+                return false;
+            Object[] elements = selection.toArray();
+            if (ArrayUtil.hasElementsOfType(elements,
+                PendingUpdateAdapter.class))
+                return false;
+            return true;
         }
     }