diff --git a/gtk/gtkeditablelabel.c b/gtk/gtkeditablelabel.c
index 959d0428d8..103b125649 100644
--- a/gtk/gtkeditablelabel.c
+++ b/gtk/gtkeditablelabel.c
@@ -341,6 +341,9 @@ gtk_editable_label_dispose (GObject *object)
 
   g_clear_pointer (&self->stack, gtk_widget_unparent);
 
+  self->entry = NULL;
+  self->label = NULL;
+
   G_OBJECT_CLASS (gtk_editable_label_parent_class)->dispose (object);
 }