diff --git a/ChangeLog b/ChangeLog
index 7664d9dc29..11ee415dcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-07-15  Matthias Clasen  <mclasen@redhat.com>
 
+	Bug 488766 – GtkFileChooserButton doesn't clear icon after
+	gtk_file_chooser_unselect_all
+
+	* gtk/gtkfilechooserbutton.c (update_label_and_image): Unset
+	the image when the label is set to "(None)". Reported by
+	Neil Roberts
+
 	* tests/testfilechooserbutton.c: Add an "Unselect all" button.
 
 2008-07-15  Matthias Clasen  <mclasen@redhat.com>
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 5647ccc30c..1967d4989f 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -2387,12 +2387,15 @@ out:
       g_free (label_text);
     }
   else
-    gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME));
+    {
+      gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME));
+      gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), NULL);
+    }
 }
 
 
 /* ************************ *
- *  Child Object Callbacks  *
+ /*  Child Object Callbacks  *
  * ************************ */
 
 /* File System */