diff --git a/ChangeLog b/ChangeLog
index 983d0b55f4..2e07d7ed97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-19  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_allocate): set dy to zero
+	if treeview's height is smaller than the current page_size (just
+	like we do elsewhere).
+
 2005-06-19  Kristian Rietveld  <kris@gtk.org>
 
 	Make mousewheel scrolling possible in typeahead mode, suggestion
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 983d0b55f4..2e07d7ed97 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-06-19  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_allocate): set dy to zero
+	if treeview's height is smaller than the current page_size (just
+	like we do elsewhere).
+
 2005-06-19  Kristian Rietveld  <kris@gtk.org>
 
 	Make mousewheel scrolling possible in typeahead mode, suggestion
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 983d0b55f4..2e07d7ed97 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-06-19  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_allocate): set dy to zero
+	if treeview's height is smaller than the current page_size (just
+	like we do elsewhere).
+
 2005-06-19  Kristian Rietveld  <kris@gtk.org>
 
 	Make mousewheel scrolling possible in typeahead mode, suggestion
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 914624ce68..18ba1d47ed 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2095,7 +2095,9 @@ gtk_tree_view_size_allocate (GtkWidget     *widget,
   gtk_adjustment_changed (tree_view->priv->vadjustment);
 
   /* now the adjustments and window sizes are in sync, we can sync toprow/dy again */
-  if (gtk_tree_row_reference_valid (tree_view->priv->top_row))
+  if (tree_view->priv->height <= tree_view->priv->vadjustment->page_size)
+    gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0);
+  else if (gtk_tree_row_reference_valid (tree_view->priv->top_row))
     gtk_tree_view_top_row_to_dy (tree_view);
   else
     gtk_tree_view_dy_to_top_row (tree_view);