diff --git a/ChangeLog b/ChangeLog
index 939a1d142c..092cffe471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-17  Kristian Rietveld  <kris@gtk.org>
+
+	Fixes #307914 (Alexander Larsson), fixing some breakage caused
+	by my previous commit.
+
+	* gtk/gtktreeview.c (validate_visible_area): force dy to be zero
+	when it fits on a single page,
+	(scroll_sync_handler): same here.
+
 Thu Jun 16 15:33:42 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkcursor-x11.c (update_cursor): remove unused variable.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 939a1d142c..092cffe471 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-06-17  Kristian Rietveld  <kris@gtk.org>
+
+	Fixes #307914 (Alexander Larsson), fixing some breakage caused
+	by my previous commit.
+
+	* gtk/gtktreeview.c (validate_visible_area): force dy to be zero
+	when it fits on a single page,
+	(scroll_sync_handler): same here.
+
 Thu Jun 16 15:33:42 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkcursor-x11.c (update_cursor): remove unused variable.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 939a1d142c..092cffe471 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-06-17  Kristian Rietveld  <kris@gtk.org>
+
+	Fixes #307914 (Alexander Larsson), fixing some breakage caused
+	by my previous commit.
+
+	* gtk/gtktreeview.c (validate_visible_area): force dy to be zero
+	when it fits on a single page,
+	(scroll_sync_handler): same here.
+
 Thu Jun 16 15:33:42 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkcursor-x11.c (update_cursor): remove unused variable.
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 95499c3deb..202e2bbd85 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4938,6 +4938,14 @@ validate_visible_area (GtkTreeView *tree_view)
 
       need_redraw = TRUE;
     }
+  else if (tree_view->priv->height <= tree_view->priv->vadjustment->page_size)
+    {
+      /* when we are not scrolling, we should never set dy to something
+       * else than zero. we update top_row to be in sync with dy = 0.
+       */
+      gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0);
+      gtk_tree_view_dy_to_top_row (tree_view);
+    }
   else
     gtk_tree_view_top_row_to_dy (tree_view);
 
@@ -5235,7 +5243,9 @@ scroll_sync_handler (GtkTreeView *tree_view)
 
   GDK_THREADS_ENTER ();
 
-  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);