diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 949250fe08..17aed3f99c 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -11177,6 +11177,9 @@ gtk_tree_view_remove_column (GtkTreeView       *tree_view,
       tree_view->priv->edited_column = NULL;
     }
 
+  if (tree_view->priv->expander_column == column)
+    tree_view->priv->expander_column = NULL;
+
   g_signal_handlers_disconnect_by_func (column,
                                         G_CALLBACK (column_sizing_notify),
                                         tree_view);