diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereManagerImpl.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereManagerImpl.java
index 9e9aadd8adb8..601fc3831ef5 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereManagerImpl.java
@@ -108,7 +108,11 @@ public class SearchEverywhereManagerImpl implements SearchEverywhereManager {
     myBalloon.pack(true, true);
 
     myProject.putUserData(SEARCH_EVERYWHERE_POPUP, myBalloon);
-    Disposer.register(myBalloon, () -> myProject.putUserData(SEARCH_EVERYWHERE_POPUP, null));
+    Disposer.register(myBalloon, () -> {
+      myProject.putUserData(SEARCH_EVERYWHERE_POPUP, null);
+      mySearchEverywhereUI = null;
+      myBalloon = null;
+    });
 
     if (project != null) {
       myBalloon.showCenteredInCurrentWindow(project);