diff --git a/panels/keyboard/keyboard-shortcuts.c b/panels/keyboard/keyboard-shortcuts.c
index 2ce0afe..26880ba 100644
--- a/panels/keyboard/keyboard-shortcuts.c
+++ b/panels/keyboard/keyboard-shortcuts.c
@@ -1114,7 +1114,6 @@ static const guint forbidden_keyvals[] = {
   GDK_KEY_KP_Enter,
   GDK_KEY_Return,
 
-  GDK_KEY_space,
   GDK_KEY_Mode_switch
 };
 
@@ -1257,8 +1256,8 @@ accel_edited_callback (GtkCellRendererText   *cell,
            || (keyval >= GDK_KEY_Greek_ALPHAaccent && keyval <= GDK_KEY_Greek_omega)
            || (keyval >= GDK_KEY_hebrew_doublelowline && keyval <= GDK_KEY_hebrew_taf)
            || (keyval >= GDK_KEY_Thai_kokai && keyval <= GDK_KEY_Thai_lekkao)
-           || (keyval >= GDK_KEY_Hangul && keyval <= GDK_KEY_Hangul_Special)
            || (keyval >= GDK_KEY_Hangul_Kiyeog && keyval <= GDK_KEY_Hangul_J_YeorinHieuh)
+           || (keyval == GDK_KEY_space && mask == 0)
            || keyval_is_forbidden (keyval)) {
         GtkWidget *dialog;
         char *name;
