diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog
index 4eb02e5b4..a68de2df9 100644
--- a/capplets/appearance/ChangeLog
+++ b/capplets/appearance/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-07  Thomas Wood  <thos@gnome.org>
+
+	* appearance-style.c: (prepare_combo): Fix icon theme combo box
+
 2007-05-07  Thomas Wood  <thos@gnome.org>
 
 	* appearance-style.c: (prepare_combo): Use GConfPropertyEditor for theme
diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c
index deda7f280..cc51f9c2c 100644
--- a/capplets/appearance/appearance-style.c
+++ b/capplets/appearance/appearance-style.c
@@ -112,6 +112,7 @@ prepare_combo (AppearanceData *data, GtkWidget *combo, enum ThemeType type)
 
     case ICON_THEMES:
       list = gnome_theme_icon_info_find_all ();
+      break;
 
     case CURSOR_THEMES:
       list = NULL; /* don't know what to do yet */
@@ -125,7 +126,7 @@ prepare_combo (AppearanceData *data, GtkWidget *combo, enum ThemeType type)
 
   for (l = list; l; l = g_list_next (l))
   {
-    gchar *name;
+    gchar *name = NULL;
     GtkTreeIter i;
 
     if (type < ICON_THEMES)