diff --git a/ChangeLog b/ChangeLog
index 0bc19dc17a..af0eebe186 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c (adjust_wrap_width): Apply some
+	arbitrary lower limit for the guessed wrap width. (#332466,
+	Donald Straney)
+
 2006-03-05  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix handling of image-only buttons.  (#332985, Kalle 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0bc19dc17a..af0eebe186 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-03-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c (adjust_wrap_width): Apply some
+	arbitrary lower limit for the guessed wrap width. (#332466,
+	Donald Straney)
+
 2006-03-05  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix handling of image-only buttons.  (#332985, Kalle 
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 77b4e2d624..95122e88fd 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -2605,7 +2605,7 @@ adjust_wrap_width (GtkIconView     *icon_view,
 				  NULL);
 	  
       if (item->width == -1)
-	wrap_width = pixbuf_width;
+	wrap_width = MAX (2 * pixbuf_width, 50);
       else if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL)
 	wrap_width = item->width;
       else