diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog
index 9b4527a47..a6d2d3dde 100644
--- a/capplets/appearance/ChangeLog
+++ b/capplets/appearance/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-14  Jens Granseuer  <jensgr@gmx.net>
+
+	* appearance-themes.c: (themes_init):
+	* data/appearance.glade: correct the item width and enable line
+	wrapping for long theme names (bug #466405)
+
 2007-08-11  Jens Granseuer  <jensgr@gmx.net>
 
 	* appearance-style.c: (conv_from_widget_cb): make sure we have a
diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c
index e0d5a73ca..97a2e8e66 100644
--- a/capplets/appearance/appearance-themes.c
+++ b/capplets/appearance/appearance-themes.c
@@ -864,7 +864,9 @@ themes_init (AppearanceData *data)
   renderer = gtk_cell_renderer_text_new ();
   g_object_set (renderer, "alignment", PANGO_ALIGN_CENTER,
 			  "wrap-mode", PANGO_WRAP_WORD_CHAR,
-			  "xalign", 0.5, "yalign", 0.0, NULL);
+			  "wrap-width", gtk_icon_view_get_item_width (icon_view),
+			  "width", gtk_icon_view_get_item_width (icon_view),
+			  "xalign", 0.0, "yalign", 0.0, NULL);
   gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (icon_view), renderer, FALSE);
   gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_view), renderer,
                                   "markup", COL_LABEL, NULL);
diff --git a/capplets/appearance/data/appearance.glade b/capplets/appearance/data/appearance.glade
index 81410334b..ac925dd27 100644
--- a/capplets/appearance/data/appearance.glade
+++ b/capplets/appearance/data/appearance.glade
@@ -700,7 +700,7 @@
                             <property name="spacing">3</property>
                             <property name="margin">18</property>
                             <property name="width_request">1</property>
-                            <property name="item_width">135</property>
+                            <property name="item_width">138</property>
                           </widget>
                         </child>
                       </widget>