diff --git a/java/java-tests/testSrc/com/intellij/find/FindInEditorTest.java b/java/java-tests/testSrc/com/intellij/find/FindInEditorTest.java
new file mode 100644
index 000000000000..f3eb8816b98b
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/find/FindInEditorTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.find;
+
+import com.intellij.find.impl.FindResultImpl;
+import com.intellij.find.impl.livePreview.LivePreviewController;
+import com.intellij.find.impl.livePreview.SearchResults;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
+
+import java.util.List;
+
+public class FindInEditorTest extends LightCodeInsightTestCase {
+
+  private LivePreviewController myLivePreviewController;
+  private SearchResults mySearchResults;
+  private FindModel myFindModel;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+
+    myFindModel = new FindModel();
+    myFindModel.addObserver(new FindModel.FindModelObserver() {
+      @Override
+      public void findModelChanged(FindModel findModel) {
+        myLivePreviewController.updateInBackground(myFindModel, true);
+      }
+    });
+  }
+
+  private void initFind() {
+    mySearchResults = new SearchResults(getEditor(), getProject());
+    myLivePreviewController = new LivePreviewController(mySearchResults, null);
+    myLivePreviewController.on();
+  }
+
+  public void test1() throws Exception {
+    configureFromFileText("file.txt", "abc");
+    initFind();
+    myFindModel.setStringToFind("a");
+    type("a");
+    List<FindResult> occurrences = mySearchResults.getOccurrences();
+    assertContainsElements(occurrences, new FindResultImpl(0, 1));
+  }
+}
diff --git a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
index 0ee22bf85753..e35dd2c6de9d 100644
--- a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
+++ b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
@@ -135,7 +135,6 @@ public class EditorSearchComponent extends EditorHeaderComponent implements Data
   private JComponent myToolbarComponent;
 
   private LivePreviewController myLivePreviewController;
-  private LivePreview myLivePreview;
   private SearchResults mySearchResults;
 
   private final FindModel myFindModel;
diff --git a/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreview.java b/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreview.java
index 5f0edab9acf6..d6998754ee89 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreview.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreview.java
@@ -194,6 +194,7 @@ public class LivePreview extends DocumentAdapter implements ReplacementView.Dele
     mySearchResults = searchResults;
     searchResultsUpdated(searchResults);
     searchResults.addListener(this);
+    myListeningSelection = true;
     mySearchResults.getEditor().getSelectionModel().addSelectionListener(this);
   }
 
diff --git a/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreviewController.java b/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreviewController.java
index a6e3ee654616..ee54afdc4e6b 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreviewController.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreviewController.java
@@ -137,10 +137,10 @@ public class LivePreviewController implements LivePreview.Delegate, FindUtil.Rep
     return myReplaceDenied;
   }
 
-  public LivePreviewController(SearchResults searchResults, EditorSearchComponent component) {
+  public LivePreviewController(SearchResults searchResults, @Nullable EditorSearchComponent component) {
     mySearchResults = searchResults;
     mySearchResults.addListener(this);
-    this.myComponent = component;
+    myComponent = component;
     getEditor().getDocument().addDocumentListener(myDocumentListener);
   }
 
@@ -269,8 +269,10 @@ public class LivePreviewController implements LivePreview.Delegate, FindUtil.Rep
     if (textRange == null) {
       mySuppressUpdate = false;
     }
-    myComponent.addTextToRecent(myComponent.getReplaceField());
-    myComponent.clearUndoInTextFields();
+    if (myComponent != null) {
+      myComponent.addTextToRecent(myComponent.getReplaceField());
+      myComponent.clearUndoInTextFields();
+    }
   }
 
   public void exclude() {
@@ -297,6 +299,7 @@ public class LivePreviewController implements LivePreview.Delegate, FindUtil.Rep
   }
 
   public void dispose() {
+    off();
     if (myDisposed) return;
 
     mySearchResults.dispose();