diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index 3f41499da..d557a9471 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-28  Bastien Nocera  <hadess@hadess.net>
+
+	* gnome-keybinding-properties.c (setup_dialog): Make Enter
+	work as expected in the custom key shortcut edit dialogue
+
 2009-01-28  Bastien Nocera  <hadess@hadess.net>
 
 	* gnome-keybinding-properties.c (append_keys_to_tree),
diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
index 7807ebef3..d3543a530 100644
--- a/capplets/keybindings/gnome-keybinding-properties.c
+++ b/capplets/keybindings/gnome-keybinding-properties.c
@@ -1851,6 +1851,8 @@ setup_dialog (GladeXML *dialog)
   custom_shortcut_dialog = WID ("custom-shortcut-dialog");
   custom_shortcut_name_entry = WID ("custom-shortcut-name-entry");
   custom_shortcut_command_entry = WID ("custom-shortcut-command-entry");
+  gtk_dialog_set_default_response (GTK_DIALOG (custom_shortcut_dialog),
+				   GTK_RESPONSE_OK);
   gtk_window_set_transient_for (GTK_WINDOW (custom_shortcut_dialog),
                                 GTK_WINDOW (widget));
 }