diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index f3d9b47b9..7cb6751ad 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-26  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=86575
+	* gnome-keybinding-properties.c (setup_dialog) : handle missing
+	  pixmaps more smoothly.
+
 2002-06-21  Stephen Browne <stephen.bronwe@sun.com>
 
 	* gnome-keybinding-properties.c : moved metacity detection
diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
index 085f1be23..a69b060f8 100644
--- a/capplets/keybindings/gnome-keybinding-properties.c
+++ b/capplets/keybindings/gnome-keybinding-properties.c
@@ -760,10 +760,11 @@ setup_dialog (GladeXML *dialog)
   widget = WID ("gnome-keybinding-dialog");
   filename = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP, "keyboard-shortcut.png", TRUE, NULL);
   icon_pixbuf = gdk_pixbuf_new_from_file ("keyboard-shortcut.png", NULL);
-  if (icon_pixbuf != NULL)
+  if (icon_pixbuf != NULL) {
     gtk_window_set_icon (GTK_WINDOW (widget), icon_pixbuf);
+    g_object_unref (icon_pixbuf);
+  }
   g_free (filename);
-  g_object_unref (icon_pixbuf);
   gtk_widget_show (widget);
 
   g_signal_connect (G_OBJECT (widget), "response", G_CALLBACK(cb_dialog_response), NULL);