diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSaverDialogImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSaverDialogImpl.java
index 92c268d7f4e8..fd1ac1fab1e0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSaverDialogImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSaverDialogImpl.java
@@ -161,6 +161,11 @@ public class FileSaverDialogImpl extends FileChooserDialogImpl implements FileSa
     return panel;
   }
 
+  @Override
+  public JComponent getPreferredFocusedComponent() {
+    return myFileName;
+  }
+
   private boolean isFileNameExist() {
     if (myPathTextField == null) return false;
     final String path = myPathTextField.getTextFieldText();