diff --git a/ChangeLog b/ChangeLog
index 914f6a3baf..4a1b8d7bd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-09-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkiconview.c (gtk_icon_view_move_cursor_left_right) 
+	(gtk_icon_view_move_cursor_start_end) 
+	(gtk_icon_view_move_cursor_page_up_down) 
+	(gtk_icon_view_move_cursor_up_down): Handle an empty icon
+	view gracefully.  (#152486)
+
 	Allow keynav to selectable labels (#138085, David Hawthorne):
 	
 	* gtk/gtkdialog.c (gtk_dialog_map): Skip selectable labels when
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 914f6a3baf..4a1b8d7bd2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2004-09-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkiconview.c (gtk_icon_view_move_cursor_left_right) 
+	(gtk_icon_view_move_cursor_start_end) 
+	(gtk_icon_view_move_cursor_page_up_down) 
+	(gtk_icon_view_move_cursor_up_down): Handle an empty icon
+	view gracefully.  (#152486)
+
 	Allow keynav to selectable labels (#138085, David Hawthorne):
 	
 	* gtk/gtkdialog.c (gtk_dialog_map): Skip selectable labels when
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 914f6a3baf..4a1b8d7bd2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,11 @@
 2004-09-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkiconview.c (gtk_icon_view_move_cursor_left_right) 
+	(gtk_icon_view_move_cursor_start_end) 
+	(gtk_icon_view_move_cursor_page_up_down) 
+	(gtk_icon_view_move_cursor_up_down): Handle an empty icon
+	view gracefully.  (#152486)
+
 	Allow keynav to selectable labels (#138085, David Hawthorne):
 	
 	* gtk/gtkdialog.c (gtk_dialog_map): Skip selectable labels when
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 914f6a3baf..4a1b8d7bd2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
 2004-09-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkiconview.c (gtk_icon_view_move_cursor_left_right) 
+	(gtk_icon_view_move_cursor_start_end) 
+	(gtk_icon_view_move_cursor_page_up_down) 
+	(gtk_icon_view_move_cursor_up_down): Handle an empty icon
+	view gracefully.  (#152486)
+
 	Allow keynav to selectable labels (#138085, David Hawthorne):
 	
 	* gtk/gtkdialog.c (gtk_dialog_map): Skip selectable labels when
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 69380d44b5..514234b47f 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -2584,7 +2584,7 @@ gtk_icon_view_move_cursor_up_down (GtkIconView *icon_view,
       else
 	list = g_list_last (icon_view->priv->items);
 
-      item = list->data;
+      item = list ? list->data : NULL;
     }
   else
     item = find_item (icon_view, 
@@ -2636,7 +2636,7 @@ gtk_icon_view_move_cursor_page_up_down (GtkIconView *icon_view,
       else
 	list = g_list_last (icon_view->priv->items);
 
-      item = list->data;
+      item = list ? list->data : NULL;
     }
   else
     item = find_item_page_up_down (icon_view, 
@@ -2688,7 +2688,7 @@ gtk_icon_view_move_cursor_left_right (GtkIconView *icon_view,
       else
 	list = g_list_last (icon_view->priv->items);
 
-      item = list->data;
+      item = list ? list->data : NULL;
     }
   else
     item = find_item (icon_view, 
@@ -2737,7 +2737,7 @@ gtk_icon_view_move_cursor_start_end (GtkIconView *icon_view,
   else
     list = g_list_last (icon_view->priv->items);
   
-  item = list->data;
+  item = list ? list->data : NULL;
 
   if (!item)
     return;