diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllWithClassRefType_after.java b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllWithClassRefType_after.java
index 4d4f05da1941..9dc08ab38e06 100644
--- a/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllWithClassRefType_after.java
+++ b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllWithClassRefType_after.java
@@ -1,12 +1,12 @@
 public class Derr {
 
-    public static final Long VALUEONE = new Long(1);
+    public static final Long ONE = new Long(1);
 
     public static void main(String[] args) {
         long value;
 
-        value = VALUEONE;
-        value = VALUEONE;
-        value = VALUEONE;
+        value = ONE;
+        value = ONE;
+        value = ONE;
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAllMethodCalls_after.java b/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAllMethodCalls_after.java
index 6853ca829b2f..04616eb6e31f 100644
--- a/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAllMethodCalls_after.java
+++ b/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAllMethodCalls_after.java
@@ -1,6 +1,6 @@
 public class Aaa {
-  public String method(String stringstring) {
-    return stringstring + stringstring + stringstring;
+  public String method(String string) {
+    return string + string + string;
   }
 
   public String getString() {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
index da3943ca2baa..c38694ac3875 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
@@ -9,10 +9,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.command.impl.StartMarkAction;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.EditorFactory;
-import com.intellij.openapi.editor.RangeMarker;
-import com.intellij.openapi.editor.ScrollType;
+import com.intellij.openapi.editor.*;
 import com.intellij.openapi.editor.colors.EditorColors;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.event.DocumentEvent;
@@ -35,6 +32,7 @@ import com.intellij.refactoring.RefactoringActionHandler;
 import com.intellij.refactoring.listeners.RefactoringEventData;
 import com.intellij.refactoring.listeners.RefactoringEventListener;
 import com.intellij.refactoring.rename.inplace.InplaceRefactoring;
+import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer;
 import com.intellij.util.ui.PositionTracker;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -268,6 +266,7 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
     }
   }
 
+  private RangeMarker mySelectedRange = null;
   private boolean myShouldSelect = true;
   @Override
   protected boolean shouldSelectAll() {
@@ -280,6 +279,15 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
       if (templateState != null) {
         myEditor.putUserData(INTRODUCE_RESTART, true);
         try {
+          SelectionModel selectionModel = myEditor.getSelectionModel();
+          if (selectionModel.hasSelection()) {
+            mySelectedRange = myEditor.getDocument().createRangeMarker(selectionModel.getSelectionStart(), selectionModel.getSelectionEnd());
+            mySelectedRange.setGreedyToRight(true);
+            mySelectedRange.setGreedyToLeft(true);
+          }
+          else {
+            mySelectedRange = null;
+          }
           final TextRange range = templateState.getCurrentVariableRange();
           if (range != null) {
             final TextResult inputText = templateState.getVariableValue(PRIMARY_VARIABLE_NAME);
@@ -296,6 +304,10 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
             startInplaceIntroduceTemplate();
           }
           finally {
+            if (mySelectedRange != null) {
+              mySelectedRange.dispose();
+              mySelectedRange = null;
+            }
             myShouldSelect = true;
           }
         }
@@ -311,7 +323,12 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
   @Override
   protected void restoreSelection() {
     if (!shouldSelectAll()) {
-      myEditor.getSelectionModel().removeSelection();
+      if (mySelectedRange != null) {
+        VariableInplaceRenamer.restoreSelection(myEditor, new TextRange(mySelectedRange.getStartOffset(), mySelectedRange.getEndOffset()));
+      }
+      else {
+        myEditor.getSelectionModel().removeSelection();
+      }
     }
   }
 
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
index 4049e76b2911..b44938e9520d 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
@@ -171,7 +171,7 @@ public class VariableInplaceRenamer extends InplaceRefactoring {
   /**
    * @param selectedRange range which is relative to the {@code editor}
    */
-  static void restoreSelection(@NotNull Editor editor, @NotNull TextRange selectedRange) {
+   public static void restoreSelection(@NotNull Editor editor, @NotNull TextRange selectedRange) {
     if (handleSelectionIntersection(editor, selectedRange)) {
       return;
     }