diff --git a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
index 527315f7aae2..5ea80985af41 100644
--- a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
+++ b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
@@ -448,6 +448,13 @@ public abstract class AbstractWizard<T extends Step> extends DialogWrapper {
     });
   }
 
+  @Nullable
+  @Override
+  public JComponent getPreferredFocusedComponent() {
+    JComponent component = mySteps.get(myCurrentStep).getPreferredFocusedComponent();
+    return component == null ? super.getPreferredFocusedComponent() : component;
+  }
+
   protected boolean canGoNext() {
     return true;
   }