diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
index a100d8430321..2c85d06fbf74 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
@@ -255,7 +255,7 @@ public class IntentionListStep implements ListPopupStep<IntentionActionWithTextC
         ApplicationManager.getApplication().invokeLater(new Runnable() {
           @Override
           public void run() {
-            if (myProject.isDisposed()) return;
+            if (myProject.isDisposed() || myEditor != null && myEditor.isDisposed()) return;
             if (DumbService.isDumb(myProject) && !DumbService.isDumbAware(cachedAction)) {
               DumbService.getInstance(myProject).showDumbModeNotification(cachedAction.getText() + " is not available during indexing");
               return;