diff --git a/ChangeLog b/ChangeLog
index e317a7e3..06c9315b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
+2007-08-25  Soren Sandmann <sandmann@daimi.au.dk>
+
+	* treeviewutils.c (tree_view_set_model_with_default_sort): Work
+	around GTK+ bug 405625.
+
 2007-08-04  Soren Sandmann <sandmann@daimi.au.dk>
 
 	* sysprof.c: Update to use new tree view API.
 
 	* treeviewutils.c: Do customized sorting to get default sort
-	orders on columns. Workaround GTK+ bug 333791.
+	orders on columns. Workaround for GTK+ bug 333791.
 
 2007-03-24  Soren Sandmann <sandmann@daimi.au.dk>
 
diff --git a/treeviewutils.c b/treeviewutils.c
index 9547809f..bab888e8 100644
--- a/treeviewutils.c
+++ b/treeviewutils.c
@@ -258,6 +258,7 @@ tree_view_set_model_with_default_sort (GtkTreeView *view,
 	int		old_column;
 	GtkSortType	old_type;
 	GtkTreeSortable *old_model;
+	GtkAdjustment   *adjustment;
 
 	old_model = GTK_TREE_SORTABLE (gtk_tree_view_get_model (view));
 
@@ -274,6 +275,11 @@ tree_view_set_model_with_default_sort (GtkTreeView *view,
 		tree_view_set_sort_column (view, old_column, old_type);
 	else
 		tree_view_set_sort_column (view, model_column, default_sort);
+
+	/* Workaround for GTK+ crack, see bug 405625 */
+	adjustment = gtk_tree_view_get_vadjustment (view);
+	if (adjustment)
+		gtk_adjustment_set_value (adjustment, 0);
 }
 
 static void