1 files changed, 13 insertions, 1 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
index af3c193ca9d9..04beaa0f370e 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
@@ -182,9 +182,21 @@ public class CustomizeIDEWizardDialog extends DialogWrapper implements ActionLis
   }
 
   @Override
+  public void doCancelAction() {
+    doOKAction();
+  }
+
+  @Override
   protected void doOKAction() {
     for (AbstractCustomizeWizardStep step : mySteps) {
-      if (!step.beforeOkAction()) return;
+      if (!step.beforeOkAction()) {
+        int index = mySteps.indexOf(step);
+        if (myIndex != index) {
+          myIndex = index;
+          initCurrentStep(true);
+        }
+        return;
+      }
     }
     super.doOKAction();
   }