diff --git a/ui/pane.py b/ui/pane.py
index 2818de6..e916908 100644
--- a/ui/pane.py
+++ b/ui/pane.py
@@ -8,12 +8,9 @@ class Pane(Gtk.Paned):
     def __init__(self):
         Gtk.Paned.__init__(self)
 
-        # Suppress some warnings during testing
-        if playlist.Box.get_parent(): playlist.Box.unparent()
-
         self.set_shrink_start_child(False)
         self.set_start_child(sidebar.Sidebar())
-        self.set_end_child(playlist.Box)
+        self.set_end_child(playlist.Panel())
         self.set_vexpand(True)
 
         lib.settings.initialize("sidebar.width", 250)
diff --git a/ui/test_pane.py b/ui/test_pane.py
index f89b911..572a655 100644
--- a/ui/test_pane.py
+++ b/ui/test_pane.py
@@ -15,8 +15,8 @@ class TestPane(unittest.TestCase):
 
         self.assertIsInstance(paned, Gtk.Paned)
         self.assertIsInstance(paned.get_start_child(), sidebar.Sidebar)
+        self.assertIsInstance(paned.get_end_child(), playlist.Panel)
         self.assertEqual(paned.get_orientation(), Gtk.Orientation.HORIZONTAL)
-        self.assertEqual(paned.get_end_child(), playlist.Box)
         self.assertFalse(paned.get_shrink_start_child())
         self.assertTrue(paned.get_vexpand())