diff --git a/ChangeLog b/ChangeLog
index 9af287c0ae..251b65b72b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkiconview.c (gtk_icon_view_set_cursor): Scroll to the
+	item.  (#306839, Jonathan Blandford)
+
 	* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): Check for
 	negative before appending the index, to avoid double error
 	message.  (#306393, Morten Welinder)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9af287c0ae..251b65b72b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-06-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkiconview.c (gtk_icon_view_set_cursor): Scroll to the
+	item.  (#306839, Jonathan Blandford)
+
 	* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): Check for
 	negative before appending the index, to avoid double error
 	message.  (#306393, Morten Welinder)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9af287c0ae..251b65b72b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-06-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkiconview.c (gtk_icon_view_set_cursor): Scroll to the
+	item.  (#306839, Jonathan Blandford)
+
 	* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): Check for
 	negative before appending the index, to avoid double error
 	message.  (#306393, Morten Welinder)
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index d2758313f8..4eae3915d3 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1733,6 +1733,8 @@ gtk_icon_view_set_cursor (GtkIconView     *icon_view,
     }
 
   gtk_icon_view_set_cursor_item (icon_view, item, cell_pos);
+  gtk_icon_view_scroll_to_item (icon_view, item);
+
   if (start_editing)
     gtk_icon_view_start_editing (icon_view, item, info, NULL);
 }