diff --git a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
index 3c0f52c9ea64..31e12e7ed942 100644
--- a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
+++ b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
@@ -708,9 +708,7 @@ public class EditorSearchComponent extends JPanel implements DataProvider, Selec
     }
     myLivePreview.cleanUp();
     myLivePreview.dispose();
-    if (myListeningSelection) {
-      myEditor.getSelectionModel().removeSelectionListener(this);
-    }
+    setTrackingSelection(false);
     addTextToRecents(mySearchField);
     if (myReplaceField != null) {
       addTextToRecents(myReplaceField);