diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
index 8696faa2b7a0..45f0da6dd5ab 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
@@ -1027,6 +1027,10 @@ public class Switcher extends AnAction implements DumbAware {
       public void propertyChange(PropertyChangeEvent evt) {
         final MyList list = getSelectedList();
         final Object value = list.getSelectedValue();
+        if (project.isDisposed()) {
+          myPopup.cancel();
+          return;
+        }
         ((NameFilteringListModel)files.getModel()).refilter();
         ((NameFilteringListModel)toolWindows.getModel()).refilter();
         if (files.getModel().getSize() + toolWindows.getModel().getSize() == 0) {