diff --git a/ChangeLog b/ChangeLog
index 8bd7155df8..222c39605c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c (adjust_wrap_width): Adjust the 
+	wrap-width also if an explicit item width is set.  
+	(#322475, Alex Graveley)
+
 2005-12-20  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkiconview.c (gtk_icon_view_button_press): Reset 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8bd7155df8..222c39605c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-12-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c (adjust_wrap_width): Adjust the 
+	wrap-width also if an explicit item width is set.  
+	(#322475, Alex Graveley)
+
 2005-12-20  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkiconview.c (gtk_icon_view_button_press): Reset 
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 0ed15e8467..c3f13ecb45 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -2578,8 +2578,7 @@ adjust_wrap_width (GtkIconView     *icon_view,
   GtkIconViewCellInfo *pixbuf_info;
   gint pixbuf_width, wrap_width;
       
-  if (icon_view->priv->item_width < 0 &&
-      icon_view->priv->text_cell != -1 &&
+  if (icon_view->priv->text_cell != -1 &&
       icon_view->priv->pixbuf_cell != -1)
     {
       text_info = g_list_nth_data (icon_view->priv->cell_list,