diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java
index fa054c57b5db..e207ed7aef03 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java
@@ -486,6 +486,10 @@ public class InplaceIntroduceConstantPopup {
         ApplicationManager.getApplication().runWriteAction(runnable);
       }
       super.moveOffsetAfter(success);
+      if (myLocalVariable != null && myLocalVariable.isValid()) {
+        myEditor.getCaretModel().moveToOffset(myLocalVariable.getTextOffset());
+        myEditor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
+      }
       if (myMoveToAnotherClassCb.isSelected()) {
         ApplicationManager.getApplication().invokeLater(new Runnable() {
           @Override
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
index 9c99c07722a4..d137c9bdffc4 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
@@ -385,6 +385,10 @@ public class InplaceIntroduceFieldPopup {
         ApplicationManager.getApplication().runWriteAction(runnable);
       }
       super.moveOffsetAfter(success);
+      if (myLocalVariable != null && myLocalVariable.isValid()) {
+        myEditor.getCaretModel().moveToOffset(myLocalVariable.getTextOffset());
+        myEditor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
+      }
     }
 
     @Override
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
index 72c32df0e0af..4bc1422a9a7a 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
@@ -368,6 +368,10 @@ class InplaceIntroduceParameterPopup extends IntroduceParameterSettingsUI {
         CommandProcessor.getInstance().executeCommand(myProject, runnable, IntroduceParameterHandler.REFACTORING_NAME, null);
       }
       super.moveOffsetAfter(false);
+      if (myLocalVar != null && myLocalVar.isValid()) {
+        myEditor.getCaretModel().moveToOffset(myLocalVar.getTextOffset());
+        myEditor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
+      }
     }
 
     @Override