diff --git a/platform/lang-impl/src/com/intellij/find/SearchReplaceComponent.java b/platform/lang-impl/src/com/intellij/find/SearchReplaceComponent.java
index 0bcd7e35ba53..f3a2fab88b96 100644
--- a/platform/lang-impl/src/com/intellij/find/SearchReplaceComponent.java
+++ b/platform/lang-impl/src/com/intellij/find/SearchReplaceComponent.java
@@ -342,7 +342,7 @@ public class SearchReplaceComponent extends EditorHeaderComponent implements Dat
       ApplicationManager.getApplication().invokeLater(new Runnable() {
         @Override
         public void run() {
-          mySearchTextComponent.setCaretPosition(oldCaretPosition);
+          mySearchTextComponent.setCaretPosition(Math.min(oldCaretPosition, mySearchTextComponent.getText().length()));
         }
       });
     }