diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index a81664acdf6d..ae7b5a49437c 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -151,6 +151,9 @@ public abstract class ChooseByNameBase {
 
   public void setDisposed(boolean disposedFlag) {
     myDisposedFlag = disposedFlag;
+    if (disposedFlag) {
+      myNames[0] = myNames[1] = null;
+    }
   }
 
   /**