diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog
index 281fd2b3d..601a4a90b 100644
--- a/capplets/appearance/ChangeLog
+++ b/capplets/appearance/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-12  Denis Washington  <denisw@svn.nome.org>
+
+	* appearance.glade:
+	* appearance-desktop.c: (wp_tree_delete_event):
+	Fix for my last commit so there is no double free when the Help button has
+	been clicked.
+
 2007-05-12  Jens Granseuer  <jensgr@gmx.net>
 
 	* appearance-desktop.c: (wp_scale_type_changed),
diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
index 87401f542..e414c09cd 100644
--- a/capplets/appearance/appearance-desktop.c
+++ b/capplets/appearance/appearance-desktop.c
@@ -677,13 +677,16 @@ wp_file_open_dialog (GtkWidget *widget,
 
 static void
 wp_tree_delete_event (GtkWidget *widget,
-                      GdkEvent *event,
+                      gint response_id,
                       AppearanceData *data)
 {
-  gnome_wp_xml_save_list (data);
-  g_object_unref (data->wp_thumbs);
-  g_object_ref_sink (data->wp_filesel);
-  g_object_unref (data->wp_filesel);
+  if (response_id == 0 || response_id == GTK_RESPONSE_DELETE_EVENT) /* 0 = Close */
+  {
+    gnome_wp_xml_save_list (data);
+    g_object_unref (data->wp_thumbs);
+    g_object_ref_sink (data->wp_filesel);
+    g_object_unref (data->wp_filesel);
+  }
 }
 
 static void
diff --git a/capplets/appearance/appearance.glade b/capplets/appearance/appearance.glade
index ecb825ce0..094ba3975 100644
--- a/capplets/appearance/appearance.glade
+++ b/capplets/appearance/appearance.glade
@@ -2097,6 +2097,7 @@ Text only</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label" translatable="yes">gtk-help</property>
                 <property name="use_stock">True</property>
+                <property name="response_id">1</property>
               </widget>
             </child>
             <child>
@@ -2107,6 +2108,7 @@ Text only</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label" translatable="yes">gtk-close</property>
                 <property name="use_stock">True</property>
+                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="position">1</property>