3 files changed, 24 insertions, 0 deletions
diff --git a/src/gtk/nautilusgtkplacesview.c b/src/gtk/nautilusgtkplacesview.c
index 0d062c9ee..f8708c043 100644
--- a/src/gtk/nautilusgtkplacesview.c
+++ b/src/gtk/nautilusgtkplacesview.c
@@ -435,6 +435,8 @@ nautilus_gtk_places_view_dispose (GObject *object)
   g_cancellable_cancel (view->networks_fetching_cancellable);
   g_clear_pointer (&view->popup_menu, gtk_widget_unparent);
 
+  gtk_widget_dispose_template (GTK_WIDGET (view), NAUTILUS_TYPE_GTK_PLACES_VIEW);
+
   G_OBJECT_CLASS (nautilus_gtk_places_view_parent_class)->dispose (object);
 }
 
diff --git a/src/gtk/nautilusgtkplacesviewrow.c b/src/gtk/nautilusgtkplacesviewrow.c
index 64d889659..84b9e146c 100644
--- a/src/gtk/nautilusgtkplacesviewrow.c
+++ b/src/gtk/nautilusgtkplacesviewrow.c
@@ -201,6 +201,16 @@ measure_available_space (NautilusGtkPlacesViewRow *row)
 }
 
 static void
+nautilus_gtk_places_view_row_dispose (GObject *object)
+{
+  NautilusGtkPlacesViewRow *self = NAUTILUS_GTK_PLACES_VIEW_ROW (object);
+
+  gtk_widget_dispose_template (GTK_WIDGET (self), NAUTILUS_TYPE_GTK_PLACES_VIEW_ROW);
+
+  G_OBJECT_CLASS (nautilus_gtk_places_view_row_parent_class)->dispose (object);
+}
+
+static void
 nautilus_gtk_places_view_row_finalize (GObject *object)
 {
   NautilusGtkPlacesViewRow *self = NAUTILUS_GTK_PLACES_VIEW_ROW (object);
@@ -334,6 +344,7 @@ nautilus_gtk_places_view_row_class_init (NautilusGtkPlacesViewRowClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
+  object_class->dispose = nautilus_gtk_places_view_row_dispose;
   object_class->finalize = nautilus_gtk_places_view_row_finalize;
   object_class->get_property = nautilus_gtk_places_view_row_get_property;
   object_class->set_property = nautilus_gtk_places_view_row_set_property;
diff --git a/src/gtk/nautilusgtksidebarrow.c b/src/gtk/nautilusgtksidebarrow.c
index 9b6ebafee..d6ea6c0e7 100644
--- a/src/gtk/nautilusgtksidebarrow.c
+++ b/src/gtk/nautilusgtksidebarrow.c
@@ -446,6 +446,16 @@ nautilus_gtk_sidebar_row_set_end_icon (NautilusGtkSidebarRow *self,
 }
 
 static void
+nautilus_gtk_sidebar_row_dispose (GObject *object)
+{
+  NautilusGtkSidebarRow *self = NAUTILUS_GTK_SIDEBAR_ROW (object);
+
+  gtk_widget_dispose_template (GTK_WIDGET (self), NAUTILUS_TYPE_GTK_SIDEBAR_ROW);
+
+  G_OBJECT_CLASS (nautilus_gtk_sidebar_row_parent_class)->dispose (object);
+}
+
+static void
 nautilus_gtk_sidebar_row_finalize (GObject *object)
 {
   NautilusGtkSidebarRow *self = NAUTILUS_GTK_SIDEBAR_ROW (object);
@@ -490,6 +500,7 @@ nautilus_gtk_sidebar_row_class_init (NautilusGtkSidebarRowClass *klass)
   object_class->get_property = nautilus_gtk_sidebar_row_get_property;
   object_class->set_property = nautilus_gtk_sidebar_row_set_property;
   object_class->finalize = nautilus_gtk_sidebar_row_finalize;
+  object_class->dispose = nautilus_gtk_sidebar_row_dispose;
 
   properties [PROP_SIDEBAR] =
     g_param_spec_object ("sidebar",