diff --git a/platform/platform-impl/src/com/intellij/ide/startupWizard/SelectPluginsStep.form b/platform/platform-impl/src/com/intellij/ide/startupWizard/SelectPluginsStep.form
index c6acad6f1d82..49015c19796b 100644
--- a/platform/platform-impl/src/com/intellij/ide/startupWizard/SelectPluginsStep.form
+++ b/platform/platform-impl/src/com/intellij/ide/startupWizard/SelectPluginsStep.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.ide.startupWizard.SelectPluginsStep">
-  <grid id="27dc6" binding="myRootPanel" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="myRootPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
@@ -10,7 +10,7 @@
     <children>
       <scrollpane id="70455" class="com.intellij.ui.components.JBScrollPane">
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -23,7 +23,7 @@
       </scrollpane>
       <scrollpane id="9e9c6" class="com.intellij.ui.components.JBScrollPane">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <preferred-size width="-1" height="100"/>
           </grid>
         </constraints>
@@ -42,27 +42,37 @@
           </component>
         </children>
       </scrollpane>
-      <component id="56c27" class="javax.swing.JButton" binding="myEnableAllButton" default-binding="true">
-        <constraints>
-          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="&amp;Enable All"/>
-        </properties>
-      </component>
       <hspacer id="35851">
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
-      <component id="2616c" class="javax.swing.JButton" binding="myDisableAllButton" default-binding="true">
+      <grid id="acf51" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="5" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties>
-          <text value="&amp;Disable All"/>
-        </properties>
-      </component>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="56c27" class="javax.swing.JButton" binding="myEnableAllButton" default-binding="true">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="&amp;Enable All"/>
+            </properties>
+          </component>
+          <component id="2616c" class="javax.swing.JButton" binding="myDisableAllButton" default-binding="true">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="&amp;Disable All"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
     </children>
   </grid>
 </form>
diff --git a/platform/platform-impl/src/com/intellij/ui/wizard/WizardDialog.java b/platform/platform-impl/src/com/intellij/ui/wizard/WizardDialog.java
index 03381509b0f2..8685f500f683 100644
--- a/platform/platform-impl/src/com/intellij/ui/wizard/WizardDialog.java
+++ b/platform/platform-impl/src/com/intellij/ui/wizard/WizardDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import com.intellij.openapi.help.HelpManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.ex.MultiLineLabel;
-import com.intellij.ui.CommandButtonGroup;
 import com.intellij.ui.SeparatorComponent;
 import org.jetbrains.annotations.NonNls;
 
@@ -33,7 +32,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class WizardDialog<T extends WizardModel> extends DialogWrapper implements WizardCallback {
-
   protected final T myModel;
 
   private final JButton myPrevious = new JButton();
@@ -206,9 +204,9 @@ public class WizardDialog<T extends WizardModel> extends DialogWrapper implement
     }
   }
 
-
   protected JComponent createSouthPanel() {
-    final CommandButtonGroup panel = new CommandButtonGroup(BoxLayout.X_AXIS);
+    final JPanel southPanel = new JPanel(new BorderLayout());
+    final JPanel panel = new JPanel(new GridLayout(1, 0, 5, 0));
     panel.add(myPrevious);
     panel.add(myNext);
     panel.add(myFinish);
@@ -217,8 +215,9 @@ public class WizardDialog<T extends WizardModel> extends DialogWrapper implement
       // we won't be able to show help if there's no HelpManager
       panel.add(myHelp);
     }
-    panel.setBorder(BorderFactory.createEmptyBorder(8, 0, 0, 0));
-    return panel;
+    southPanel.add(panel, BorderLayout.EAST);
+    southPanel.setBorder(BorderFactory.createEmptyBorder(8, 0, 0, 0));
+    return southPanel;
   }
 
   public void onStepChanged() {