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 f6e6c3b2d616..a5f2f3107759 100644
--- a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
+++ b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
@@ -449,7 +449,7 @@ public abstract class AbstractWizard<T extends Step> extends DialogWrapper {
   }
 
   protected boolean isLastStep() {
-    return myCurrentStep == mySteps.size() - 1;
+    return myCurrentStep == mySteps.size() - 1 || getCurrentStep() == getNextStep(getCurrentStep());
   }
 
   protected JButton getNextButton() {