diff --git a/platform/lang-impl/src/com/intellij/find/impl/livePreview/SearchResults.java b/platform/lang-impl/src/com/intellij/find/impl/livePreview/SearchResults.java
index 4c3343691e9b..3880fd08ac37 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/livePreview/SearchResults.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/livePreview/SearchResults.java
@@ -292,7 +292,7 @@ public class SearchResults implements DocumentListener {
     boolean justReplaced = next != null;
     boolean toPush = true;
     if (justReplaced || (toPush = !repairCursorFromStack())) {
-      if (!tryToRepairOldCursor(oldCursorRange)) {
+      if (justReplaced || !tryToRepairOldCursor(oldCursorRange)) {
         if (myFindModel != null) {
           if(oldCursorRange != null && !myFindModel.isGlobal()) {
             myCursor = firstOccurrenceAfterOffset(oldCursorRange.getEndOffset());