diff --git a/platform/lang-impl/src/com/intellij/find/FindUtil.java b/platform/lang-impl/src/com/intellij/find/FindUtil.java
index adcfc34745f6..a7016a210caa 100644
--- a/platform/lang-impl/src/com/intellij/find/FindUtil.java
+++ b/platform/lang-impl/src/com/intellij/find/FindUtil.java
@@ -475,10 +475,10 @@ public class FindUtil {
     return true;
   }
 
-  private static boolean doReplace(Project project, final Editor editor, FindModel model, final Document document, int caretOffset,
+  private static boolean doReplace(Project project, final Editor editor, final FindModel aModel, final Document document, int caretOffset,
                                    boolean toPrompt, ReplaceDelegate delegate) {
     FindManager findManager = FindManager.getInstance(project);
-    model = (FindModel)model.clone();
+    final FindModel model = (FindModel)aModel.clone();
     int occurrences = 0;
 
     List<Pair<TextRange,String>> rangesToChange = new ArrayList<Pair<TextRange, String>>();
@@ -588,7 +588,9 @@ public class FindUtil {
               public void run() {
                 document.setText(newText);
                 editor.getCaretModel().moveToOffset(finalCaretOffset);
-                editor.getSelectionModel().removeSelection();
+                if (model.isGlobal()) {
+                  editor.getSelectionModel().removeSelection();
+                }
               }
             });
           }