diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index b0002cfa6d31..462518d7a9ca 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -978,6 +978,9 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
         if (oldItem != item) {
           mySelectionInvariant = item == null ? null : myPresentableModel.getItemPresentationInvariant(item);
           fireCurrentItemChanged(item);
+          if (myDisposed) { //a listener may have decided to close us, what can we do?
+            return;
+          }
         }
         if (item != null) {
           updateHint(item);