diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index eb342a55f7..4eead014b3 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -174,6 +174,7 @@ struct _GtkDialogPrivate
   GtkWidget *vbox;
   GtkWidget *headerbar;
   GtkWidget *action_area;
+  GtkWidget *action_box;
   GtkSizeGroup *size_group;
 
   gint use_header_bar;
@@ -289,7 +290,7 @@ apply_use_header_bar (GtkDialog *dialog)
 {
   GtkDialogPrivate *priv = dialog->priv;
 
-  gtk_widget_set_visible (priv->action_area, !priv->use_header_bar);
+  gtk_widget_set_visible (priv->action_box, !priv->use_header_bar);
   gtk_widget_set_visible (priv->headerbar, priv->use_header_bar);
   if (!priv->use_header_bar)
     {
@@ -655,6 +656,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
   gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, vbox);
   gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, headerbar);
   gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, action_area);
+  gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, action_box);
   gtk_widget_class_bind_template_callback (widget_class, gtk_dialog_delete_event_handler);
 }
 
diff --git a/gtk/resources/ui/gtkdialog.ui b/gtk/resources/ui/gtkdialog.ui
index c03b8dde79..3a2cd791c6 100644
--- a/gtk/resources/ui/gtkdialog.ui
+++ b/gtk/resources/ui/gtkdialog.ui
@@ -23,14 +23,29 @@
           <class name="dialog-vbox"/>
         </style>
         <child>
-          <object class="GtkButtonBox" id="action_area">
+          <object class="GtkBox" id="action_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <style>
-              <class name="dialog-action-area"/>
+              <class name="dialog-action-box"/>
             </style>
-           </object>
+            <child>
+              <object class="GtkButtonBox" id="action_area">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="layout_style">end</property>
+                <style>
+                  <class name="dialog-action-area"/>
+                </style>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>