diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
index 367bf750473e..df48ba1c74d5 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
@@ -1686,7 +1686,9 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
       Future future = ourUpdateAlarm.get();
       if (future == null) break;
 
-      UIUtil.dispatchAllInvocationEvents();
+      if (ApplicationManager.getApplication().isDispatchThread()) {
+        UIUtil.dispatchAllInvocationEvents();
+      }
       try {
         future.get(10, TimeUnit.MILLISECONDS);
         break;