diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c
index b9bd7073c..ba6c14bb5 100644
--- a/panels/universal-access/cc-ua-panel.c
+++ b/panels/universal-access/cc-ua-panel.c
@@ -840,5 +840,5 @@ cc_ua_panel_init (CcUaPanel *self)
   priv->focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (panel));
   gtk_container_set_focus_vadjustment (GTK_CONTAINER (content), priv->focus_adjustment);
 
-  gtk_widget_reparent (panel, GTK_WIDGET (self));
+  gtk_container_add (GTK_CONTAINER (self), panel);
 }
diff --git a/panels/universal-access/uap.ui b/panels/universal-access/uap.ui
index cd2bd0ddf..4ba90ef1d 100644
--- a/panels/universal-access/uap.ui
+++ b/panels/universal-access/uap.ui
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <child>
       <object class="GtkScrolledWindow" id="universal_access_panel">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
@@ -739,8 +736,6 @@
           </object>
         </child>
       </object>
-    </child>
-  </object>
   <object class="GtkAdjustment" id="text_scaling_factor_adjustment">
     <property name="lower">0.5</property>
     <property name="upper">3</property>