diff --git a/panels/user-accounts/data/user-accounts-dialog.ui b/panels/user-accounts/data/user-accounts-dialog.ui
index 2075765ca..76fc63e6c 100644
--- a/panels/user-accounts/data/user-accounts-dialog.ui
+++ b/panels/user-accounts/data/user-accounts-dialog.ui
@@ -61,7 +61,7 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">0</property>
                     <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow1">
+                      <object class="GtkScrolledWindow" id="list-scrolledwindow">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index 694900877..b0732568c 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -1199,12 +1199,6 @@ setup_main_window (UmUserPanelPrivate *d)
         g_object_unref (icon);
 }
 
-static void
-add_class (GtkStyleContext *context)
-{
-        gtk_style_context_add_class (context, "internal-toolbar");
-}
-
 static void
 um_user_panel_init (UmUserPanel *self)
 {
@@ -1249,8 +1243,10 @@ um_user_panel_init (UmUserPanel *self)
         d->main_box = get_widget (d, "accounts-vbox");
         gtk_widget_reparent (d->main_box, GTK_WIDGET (self));
 
+        context = gtk_widget_get_style_context (get_widget (d, "list-scrolledwindow"));
+        gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
         context = gtk_widget_get_style_context (get_widget (d, "add-remove-toolbar"));
-        g_signal_connect (context, "changed", G_CALLBACK (add_class), NULL);
+        gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
 }
 
 static void