diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index 216e7b6e2..ed3d434ae 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-30  Bastien Nocera  <hadess@hadess.net>
+
+	* eggcellrendererkeys.c: (grab_key_callback): Patch from
+	Michal Bukovjan <bukovjan@mbox.dkm.cz> to handle backspace in multi-
+	layout setups correctly (Closes: #154492)
+
 2004-11-09  Mark McLoughlin  <mark@skynet.ie>
 
 	* Makefile.am: install .desktop file in $(datadir)/applications
diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c
index 029a854cf..11130fa59 100644
--- a/capplets/keybindings/eggcellrendererkeys.c
+++ b/capplets/keybindings/eggcellrendererkeys.c
@@ -435,9 +435,9 @@ grab_key_callback (GtkWidget    *widget,
   /* filter consumed/ignored modifiers */
 
   if (keys->accel_mode == EGG_CELL_RENDERER_KEYS_MODE_GTK)
-    accel_mods = event->state & ~(consumed_modifiers | ignored_modifiers);
+    accel_mods = event->state & GDK_MODIFIER_MASK & ~(consumed_modifiers | ignored_modifiers);
   else if (keys->accel_mode == EGG_CELL_RENDERER_KEYS_MODE_X)
-    accel_mods = event->state & ~(ignored_modifiers);
+    accel_mods = event->state & GDK_MODIFIER_MASK & ~(ignored_modifiers);
   else
     g_assert_not_reached ();
     
@@ -458,9 +458,6 @@ grab_key_callback (GtkWidget    *widget,
 	  accel_keyval = 0;
 	  accel_mods = 0;
 	}
-
-      /* Remove modifiers like super and hyper, as GTK+ ignores them. */
-      accel_mods = accel_mods & GDK_MODIFIER_MASK;
     }
   
   edited = TRUE;