diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 8a2434930..509cd8793 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-24  Thomas Wood  <thos@gnome.org>
+
+	* gnome-keyboard-properties-xkbot.c: (xkb_options_load_options),
+	(xkb_options_popup_dialog):
+	* gnome-keyboard-properties.glade:
+
+	Don't close the Keyboard Layout Options window when the Help button is
+	clicked. (bug #529772).
+
 2008-04-14  Sergey Udaltsov <svu@gnome.org>
 
 	* gnome-keyboard-properties-xkb.c: getting rid of unneeded backup
diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbot.c b/capplets/keyboard/gnome-keyboard-properties-xkbot.c
index 67aa22abd..0c184a3ef 100644
--- a/capplets/keyboard/gnome-keyboard-properties-xkbot.c
+++ b/capplets/keyboard/gnome-keyboard-properties-xkbot.c
@@ -351,6 +351,12 @@ xkb_options_load_options (GladeXML * dialog)
 	gtk_widget_show_all (opts_vbox);
 }
 
+static void
+chooser_response_cb (GtkDialog *dialog, gint response, gpointer data)
+{
+	if (response == GTK_RESPONSE_CLOSE)
+		gtk_widget_destroy (GTK_WIDGET (dialog));
+}
 
 /* Create popup dialog*/
 void
@@ -367,9 +373,10 @@ xkb_options_popup_dialog (GladeXML * dialog)
 						  ("keyboard_dialog")));
 	xkb_options_load_options (chooser_dialog);
 
-	gtk_dialog_run (GTK_DIALOG (chooser));
+	g_signal_connect (chooser, "response",
+	    G_CALLBACK (chooser_response_cb), dialog);
 
-	gtk_widget_destroy (chooser);
+	gtk_dialog_run (GTK_DIALOG (chooser));
 }
 
 /* Respond to a change in the xkb gconf settings */
diff --git a/capplets/keyboard/gnome-keyboard-properties.glade b/capplets/keyboard/gnome-keyboard-properties.glade
index d85493684..e43677797 100644
--- a/capplets/keyboard/gnome-keyboard-properties.glade
+++ b/capplets/keyboard/gnome-keyboard-properties.glade
@@ -1939,7 +1939,7 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
+                <property name="response_id">-7</property>
               </widget>
               <packing>
                 <property name="position">1</property>