diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldPopupPanel.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldPopupPanel.java
index 8b9e11d0f09d..05ecd1abe3bb 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldPopupPanel.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldPopupPanel.java
@@ -166,7 +166,7 @@ public class IntroduceFieldPopupPanel extends IntroduceFieldCentralPanel {
       gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
       groupPanel.add(initializersCombo, gridBagConstraints);
       myInitializerCombo = initializersCombo;
-    } else {
+    } else if (myInitialisersPlaceModel.getSize() == 1){
       gridBagConstraints.gridwidth = 2;
       groupPanel.add(new JLabel("Initialize field in " +
                                 getPresentableText((BaseExpressionToFieldHandler.InitializationPlace)myInitialisersPlaceModel.getElementAt(0))),
@@ -186,6 +186,7 @@ public class IntroduceFieldPopupPanel extends IntroduceFieldCentralPanel {
     return mainPanel;
   }
 
+  @Nullable
   private static String getPresentableText(BaseExpressionToFieldHandler.InitializationPlace value) {
     if (value == BaseExpressionToFieldHandler.InitializationPlace.IN_CURRENT_METHOD) {
       return "current method";
@@ -193,9 +194,10 @@ public class IntroduceFieldPopupPanel extends IntroduceFieldCentralPanel {
       return "constructor";
     } else if (value == BaseExpressionToFieldHandler.InitializationPlace.IN_FIELD_DECLARATION) {
       return "field declaration";
-    } else {
+    } else if (value == BaseExpressionToFieldHandler.InitializationPlace.IN_SETUP_METHOD){
       return "setUp";
     }
+    return null;
   }
 
   protected boolean setEnabledInitializationPlaces(PsiElement initializerPart, PsiElement initializer) {