diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 4417ca20c6..ffecf16b3b 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6527,6 +6527,9 @@ gtk_tree_view_top_row_to_dy (GtkTreeView *tree_view)
   if (priv->in_top_row_to_dy)
     return;
 
+  if (gtk_adjustment_is_animating (priv->vadjustment))
+    return;
+
   if (priv->top_row)
     path = gtk_tree_row_reference_get_path (priv->top_row);
   else