diff --git a/src/ag-window.c b/src/ag-window.c
index 3600a61..94c24b1 100644
--- a/src/ag-window.c
+++ b/src/ag-window.c
@@ -328,10 +328,23 @@ ag_window_init(AgWindow *window)
     gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
 }
 
+static void
+ag_window_dispose(GObject *gobject)
+{
+    AgWindow *window = AG_WINDOW(gobject);
+
+    g_clear_object(&window->priv->builder);
+
+    G_OBJECT_CLASS(ag_window_parent_class)->dispose(gobject);
+}
+
 static void
 ag_window_class_init(AgWindowClass *klass)
 {
+    GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+
     g_type_class_add_private(klass, sizeof(AgWindowPrivate));
+    gobject_class->dispose = ag_window_dispose;
 }
 
 static GtkWidget *