diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index f636f9010..0056ea0d1 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -1959,8 +1959,6 @@ add_automatic_suspend_section (CcPowerPanel *self)
   gtk_widget_show_all (widget);
 
   dialog = priv->automatic_suspend_dialog;
-  sw = WID (priv->builder, "automatic_suspend_close");
-  g_signal_connect_swapped (sw, "clicked", G_CALLBACK (gtk_widget_hide), dialog);
   g_signal_connect (dialog, "delete-event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 
   sw = WID (priv->builder, "suspend_on_battery_switch");
diff --git a/panels/power/power.ui b/panels/power/power.ui
index dbb638e67..b2aa3d6ba 100644
--- a/panels/power/power.ui
+++ b/panels/power/power.ui
@@ -126,39 +126,12 @@
     <property name="title" translatable="yes">Automatic Suspend</property>
     <property name="type_hint">dialog</property>
     <property name="resizable">False</property>
+    <property name="use_header_bar">1</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="asdf">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="automatic_suspend_close">
-                <property name="label" translatable="yes">_Close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </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>
         <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
@@ -318,9 +291,6 @@
         </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="0">automatic_suspend_close</action-widget>
-    </action-widgets>
   </object>
 </interface>