diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 7a53f2d029..806635b620 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -2053,7 +2053,7 @@ gtk_text_view_set_buffer (GtkTextView   *text_view,
       while (priv->anchored_children.length)
         {
           AnchoredChild *ac = g_queue_peek_head (&priv->anchored_children);
-          gtk_widget_unparent (ac->widget);
+          gtk_text_view_remove (text_view, ac->widget);
           /* ac is now invalid! */
         }