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 d3e8b77d9063..74064d6e6748 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
@@ -204,6 +204,10 @@ public class InplaceIntroduceFieldPopup {
     myIntroduceFieldPanel.setVisibility(visibility);
   }
 
+  public static void setInitializationPlace(BaseExpressionToFieldHandler.InitializationPlace place) {
+    ourLastInitializerPlace = place;
+  }
+
   class FieldInplaceIntroducer extends AbstractInplaceIntroducer {
 
     private RangeMarker myFieldRangeStart;
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceFieldTest.java b/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceFieldTest.java
index 838a44c38ed9..896c67d3e204 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceFieldTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceFieldTest.java
@@ -113,6 +113,7 @@ public class InplaceIntroduceFieldTest extends LightCodeInsightTestCase {
     finally {
       myEditor.getSettings().setVariableInplaceRenameEnabled(enabled);
       templateManager.setTemplateTesting(false);
+      InplaceIntroduceFieldPopup.setInitializationPlace(null);
     }
   }