diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java
index 649cfaf12adf..3e0bfbf517b5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java
@@ -106,8 +106,11 @@ public class GrIntroduceConstantDialog extends DialogWrapper
     myTypeCombo.setEnabled(mySpecifyType.isSelected());
     updateVisibilityPanel();
     updateOkStatus();
+  }
 
-    myNameComboBox.requestFocus();
+  @Override
+  public JComponent getPreferredFocusedComponent() {
+    return myNameComboBox;
   }
 
   @Override