diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
index 59af4e62c3b1..6934d64e91e0 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
@@ -604,6 +604,15 @@ public abstract class DialogWrapper {
         return super.getBackground();
       }
     };
+
+    if (doNotAsk != null) {
+      myCheckBoxDoNotShowDialog = new JCheckBox(doNotAsk.getDoNotShowMessage());
+      myCheckBoxDoNotShowDialog.setVisible(doNotAsk.canBeHidden());
+      myCheckBoxDoNotShowDialog.setSelected(!doNotAsk.isToBeShown());
+      DialogUtil.registerMnemonic(myCheckBoxDoNotShowDialog, '&');
+    }
+    JComponent doNotAskCheckbox = createDoNotAskCheckbox();
+
     final JPanel lrButtonsPanel = new NonOpaquePanel(new GridBagLayout());
     //noinspection UseDPIAwareInsets
     final Insets insets = SystemInfo.isMacOSLeopard ? UIUtil.isUnderIntelliJLaF() ? JBUI.insets(0, 8) : JBUI.emptyInsets() : new Insets(8, 0, 0, 0); //don't wrap to JBInsets
@@ -627,7 +636,7 @@ public abstract class DialogWrapper {
         }
         lrButtonsPanel.add(buttonsPanel, bag.next());
       }
-      if (SwingConstants.CENTER == myButtonAlignment) {
+      if (SwingConstants.CENTER == myButtonAlignment && doNotAskCheckbox == null) {
         lrButtonsPanel.add(Box.createHorizontalGlue(), bag.next().weightx(1).fillCellHorizontally());    // right strut
       }
     }
@@ -639,15 +648,6 @@ public abstract class DialogWrapper {
       }
     }
 
-    if (doNotAsk != null) {
-      myCheckBoxDoNotShowDialog = new JCheckBox(doNotAsk.getDoNotShowMessage());
-      myCheckBoxDoNotShowDialog.setVisible(doNotAsk.canBeHidden());
-      myCheckBoxDoNotShowDialog.setSelected(!doNotAsk.isToBeShown());
-      DialogUtil.registerMnemonic(myCheckBoxDoNotShowDialog, '&');
-    }
-    JComponent doNotAskCheckbox = createDoNotAskCheckbox();
-
-
     if (helpButton != null || doNotAskCheckbox != null) {
       JPanel leftPanel = new JPanel(new BorderLayout());
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ShowSouthPanelTestDialogAction.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ShowSouthPanelTestDialogAction.java
index 4b71d1ad159c..2c2b3908e6ed 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ShowSouthPanelTestDialogAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ShowSouthPanelTestDialogAction.java
@@ -51,6 +51,7 @@ public class ShowSouthPanelTestDialogAction extends AnAction implements DumbAwar
     private final JCheckBox myCompact = new JCheckBox("Compact style", false);
     private final JCheckBox myErrorText = new JCheckBox("Error text", false);
     private final JCheckBox myMoveErrorTextToButtons = new JCheckBox("Move error text to the buttons", false);
+    private final JCheckBox myCenterButtons = new JCheckBox("Center buttons", false);
 
     public MyDialogWrapper(Project project) {
       super(project);
@@ -76,6 +77,7 @@ public class ShowSouthPanelTestDialogAction extends AnAction implements DumbAwar
       myAllowMergeButtons.addActionListener(e -> UISettings.getShadowInstance().setAllowMergeButtons(myAllowMergeButtons.isSelected()));
 
       myErrorText.addActionListener(e -> setErrorText(myErrorText.isSelected() ? "Error text" : null, myErrorText));
+      myCenterButtons.addActionListener(e -> setButtonsAlignment(myCenterButtons.isSelected() ? SwingUtilities.CENTER : SwingUtilities.RIGHT));
 
       panel.add(myRefresh);
       panel.add(myHasOKAction);
@@ -88,6 +90,7 @@ public class ShowSouthPanelTestDialogAction extends AnAction implements DumbAwar
       panel.add(myCompact);
       panel.add(myErrorText);
       panel.add(myMoveErrorTextToButtons);
+      panel.add(myCenterButtons);
 
       return panel;
     }
@@ -100,7 +103,6 @@ public class ShowSouthPanelTestDialogAction extends AnAction implements DumbAwar
 
     private void refreshSouthPanel() {
       mySouthPanel.setContent(super.createSouthPanel());
-      pack();
     }
 
     @Nullable