diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 4e6dbc00b9..0075f98973 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -444,7 +444,8 @@ add_cb (GtkContainer *container,
   if (priv->use_header_bar)
     g_warning ("Content added to the action area of a dialog using header bars");
 
-  gtk_widget_show (GTK_WIDGET (priv->action_box));
+  gtk_widget_set_visible (priv->action_box, TRUE);
+  gtk_widget_set_no_show_all (priv->action_box, FALSE);
 }
 
 static void
@@ -496,6 +497,7 @@ gtk_dialog_constructed (GObject *object)
     }
 
   gtk_widget_set_visible (priv->action_box, !priv->use_header_bar);
+  gtk_widget_set_no_show_all (priv->action_box, priv->use_header_bar);
 }
 
 static void
diff --git a/gtk/resources/ui/gtkdialog.ui b/gtk/resources/ui/gtkdialog.ui
index 9c10772b3d..7ea88376be 100644
--- a/gtk/resources/ui/gtkdialog.ui
+++ b/gtk/resources/ui/gtkdialog.ui
@@ -25,7 +25,6 @@
         <child>
           <object class="GtkBox" id="action_box">
             <property name="visible">True</property>
-            <property name="no-show-all">True</property>
             <property name="can_focus">False</property>
             <style>
               <class name="dialog-action-box"/>