diff --git a/src/libsysprof-ui/sysprof-recording-state-view.c b/src/libsysprof-ui/sysprof-recording-state-view.c
index 1e2ecebf..b37978bb 100644
--- a/src/libsysprof-ui/sysprof-recording-state-view.c
+++ b/src/libsysprof-ui/sysprof-recording-state-view.c
@@ -79,18 +79,18 @@ sysprof_recording_state_view_notify_elapsed (SysprofRecordingStateView *self,
 }
 
 static void
-sysprof_recording_state_view_destroy (GtkWidget *widget)
+sysprof_recording_state_view_dispose (GObject *object)
 {
-  SysprofRecordingStateView *self = (SysprofRecordingStateView *)widget;
+  SysprofRecordingStateView *self = (SysprofRecordingStateView *)object;
   SysprofRecordingStateViewPrivate *priv = sysprof_recording_state_view_get_instance_private (self);
 
   if (priv->profiler != NULL)
     {
-      g_signal_handler_disconnect (priv->profiler, priv->notify_elapsed_handler);
+      g_clear_signal_handler (&priv->notify_elapsed_handler, priv->profiler);
       g_clear_object (&priv->profiler);
     }
 
-  GTK_WIDGET_CLASS (sysprof_recording_state_view_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (sysprof_recording_state_view_parent_class)->dispose (object);
 }
 
 static void
@@ -138,11 +138,10 @@ sysprof_recording_state_view_class_init (SysprofRecordingStateViewClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
+  object_class->dispose = sysprof_recording_state_view_dispose;
   object_class->get_property = sysprof_recording_state_view_get_property;
   object_class->set_property = sysprof_recording_state_view_set_property;
 
-  widget_class->destroy = sysprof_recording_state_view_destroy;
-
   properties [PROP_PROFILER] =
     g_param_spec_object ("profiler",
                          "Profiler",