diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
index 8ee4cbf1c..01bb678d2 100644
--- a/panels/printers/cc-printers-panel.c
+++ b/panels/printers/cc-printers-panel.c
@@ -237,11 +237,7 @@ cc_printers_panel_constructed (GObject *object)
   shell = cc_panel_get_shell (CC_PANEL (self));
 
   widget = (GtkWidget*)
-    gtk_builder_get_object (self->builder, "printer-add-button");
-  cc_shell_embed_widget_in_header (shell, widget, GTK_POS_RIGHT);
-
-  widget = (GtkWidget*)
-    gtk_builder_get_object (self->builder, "search-button");
+    gtk_builder_get_object (self->builder, "top-right-buttons");
   cc_shell_embed_widget_in_header (shell, widget, GTK_POS_RIGHT);
 
   widget = (GtkWidget*)
@@ -1163,7 +1159,7 @@ cc_printers_panel_init (CcPrintersPanel *self)
   GtkWidget              *widget;
   PpCups                 *cups;
   g_autoptr(GError)       error = NULL;
-  gchar                  *objects[] = { "overlay", "permission-infobar", "printer-add-button", "search-button", NULL };
+  gchar                  *objects[] = { "overlay", "permission-infobar", "top-right-buttons", "printer-add-button", "search-button", NULL };
   guint                   builder_result;
 
   g_resources_register (cc_printers_get_resource ());
diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui
index 228eeac29..d8f8af24a 100644
--- a/panels/printers/printers.ui
+++ b/panels/printers/printers.ui
@@ -1,26 +1,33 @@
 <?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="3.12"/>
-  <object class="GtkButton" id="printer-add-button">
+  <object class="GtkBox" id="top-right-buttons">
     <property name="visible">True</property>
-    <property name="sensitive">True</property>
-    <property name="use_underline">True</property>
-    <property name="label" translatable="yes" comments="Translators: This button adds new printer.">Add…</property>
-    <style>
-      <class name="suggested-action"/>
-    </style>
-  </object>
-
-  <object class="GtkToggleButton" id="search-button">
-    <property name="visible">True</property>
-    <property name="margin-end">6</property> <!-- since we don't have access to the shell header bar -->
-    <style>
-      <class name="image-button"/>
-    </style>
+    <property name="spacing">6</property>
     <child>
-      <object class="GtkImage">
+      <object class="GtkButton" id="printer-add-button">
         <property name="visible">True</property>
-        <property name="icon_name">system-search-symbolic</property>
+        <property name="sensitive">True</property>
+        <property name="use_underline">True</property>
+        <property name="label" translatable="yes" comments="Translators: This button adds new printer.">Add…</property>
+        <style>
+          <class name="suggested-action"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToggleButton" id="search-button">
+        <property name="visible">True</property>
+        <property name="margin-end">6</property> <!-- since we don't have access to the shell header bar -->
+        <style>
+          <class name="image-button"/>
+        </style>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="icon_name">system-search-symbolic</property>
+          </object>
+        </child>
       </object>
     </child>
   </object>