diff --git a/src/sysprof/sysprof-section.c b/src/sysprof/sysprof-section.c
index 085908dd..cf0bcb12 100644
--- a/src/sysprof/sysprof-section.c
+++ b/src/sysprof/sysprof-section.c
@@ -26,6 +26,7 @@
 typedef struct
 {
   char *title;
+  SysprofSession *session;
 } SysprofSectionPrivate;
 
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (SysprofSection, sysprof_section, GTK_TYPE_WIDGET)
@@ -39,22 +40,6 @@ enum {
 
 static GParamSpec *properties [N_PROPS];
 
-static void
-sysprof_section_root (GtkWidget *widget)
-{
-  GTK_WIDGET_CLASS (sysprof_section_parent_class)->root (widget);
-
-  g_object_notify_by_pspec (G_OBJECT (widget), properties[PROP_SESSION]);
-}
-
-static void
-sysprof_section_unroot (GtkWidget *widget)
-{
-  GTK_WIDGET_CLASS (sysprof_section_parent_class)->unroot (widget);
-
-  g_object_notify_by_pspec (G_OBJECT (widget), properties[PROP_SESSION]);
-}
-
 static void
 sysprof_section_dispose (GObject *object)
 {
@@ -62,11 +47,12 @@ sysprof_section_dispose (GObject *object)
   SysprofSectionPrivate *priv = sysprof_section_get_instance_private (self);
   GtkWidget *child;
 
-  g_clear_pointer (&priv->title, g_free);
-
   while ((child = gtk_widget_get_first_child (GTK_WIDGET (self))))
     gtk_widget_unparent (child);
 
+  g_clear_object (&priv->session);
+  g_clear_pointer (&priv->title, g_free);
+
   G_OBJECT_CLASS (sysprof_section_parent_class)->dispose (object);
 }
 
@@ -103,6 +89,10 @@ sysprof_section_set_property (GObject      *object,
 
   switch (prop_id)
     {
+    case PROP_SESSION:
+      sysprof_section_set_session (self, g_value_get_object (value));
+      break;
+
     case PROP_TITLE:
       sysprof_section_set_title (self, g_value_get_string (value));
       break;
@@ -122,13 +112,10 @@ sysprof_section_class_init (SysprofSectionClass *klass)
   object_class->get_property = sysprof_section_get_property;
   object_class->set_property = sysprof_section_set_property;
 
-  widget_class->root = sysprof_section_root;
-  widget_class->unroot = sysprof_section_unroot;
-
   properties[PROP_SESSION] =
     g_param_spec_object ("session", NULL, NULL,
                          SYSPROF_TYPE_SESSION,
-                         (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+                         (G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
 
   properties[PROP_TITLE] =
     g_param_spec_string ("title", NULL, NULL,
@@ -148,15 +135,24 @@ sysprof_section_init (SysprofSection *self)
 SysprofSession *
 sysprof_section_get_session (SysprofSection *self)
 {
-  GtkRoot *root;
+  SysprofSectionPrivate *priv = sysprof_section_get_instance_private (self);
 
-  if ((root = gtk_widget_get_root (GTK_WIDGET (self))))
-    {
-      if (SYSPROF_IS_WINDOW (root))
-        return sysprof_window_get_session (SYSPROF_WINDOW (root));
-    }
+  g_return_val_if_fail (SYSPROF_IS_SECTION (self), NULL);
 
-  return NULL;
+  return priv->session;
+}
+
+void
+sysprof_section_set_session (SysprofSection *self,
+                             SysprofSession *session)
+{
+  SysprofSectionPrivate *priv = sysprof_section_get_instance_private (self);
+
+  g_return_if_fail (SYSPROF_IS_SECTION (self));
+  g_return_if_fail (!session || SYSPROF_IS_SESSION (session));
+
+  if (g_set_object (&priv->session, session))
+    g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SESSION]);
 }
 
 const char *
diff --git a/src/sysprof/sysprof-section.h b/src/sysprof/sysprof-section.h
index 1be34793..ce2b81a3 100644
--- a/src/sysprof/sysprof-section.h
+++ b/src/sysprof/sysprof-section.h
@@ -36,6 +36,8 @@ struct _SysprofSectionClass
 };
 
 SysprofSession *sysprof_section_get_session (SysprofSection *self);
+void            sysprof_section_set_session (SysprofSection *self,
+                                             SysprofSession *session);
 const char     *sysprof_section_get_title   (SysprofSection *self);
 void            sysprof_section_set_title   (SysprofSection *self,
                                              const char     *title);
diff --git a/src/sysprof/sysprof-window.ui b/src/sysprof/sysprof-window.ui
index 79bfa42f..5934773e 100644
--- a/src/sysprof/sysprof-window.ui
+++ b/src/sysprof/sysprof-window.ui
@@ -90,6 +90,9 @@
                         <property name="vexpand">true</property>
                         <child>
                           <object class="SysprofSamplesSection">
+                            <binding name="session">
+                              <lookup name="session">SysprofWindow</lookup>
+                            </binding>
                           </object>
                         </child>
                       </object>