diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index 1c32fb710..c7872c72a 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-31  Bastien Nocera  <hadess@hadess.net>
+
+	* eggcellrendererkeys.c (grab_key_callback): Fix Esc and Backspace
+	being bindable when Caps Lock is on (Closes: #524813)
+
 2008-03-31  Bastien Nocera  <hadess@hadess.net>
 
         * gnome-keybinding-properties.c (append_keys_to_tree_from_file):
diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c
index 133fa4fda..648acb353 100644
--- a/capplets/keybindings/eggcellrendererkeys.c
+++ b/capplets/keybindings/eggcellrendererkeys.c
@@ -421,7 +421,8 @@ grab_key_callback (GtkWidget    *widget,
 
   egg_keymap_resolve_virtual_modifiers (gdk_keymap_get_default (),
                                         EGG_VIRTUAL_NUM_LOCK_MASK |
-                                        EGG_VIRTUAL_SCROLL_LOCK_MASK,
+                                        EGG_VIRTUAL_SCROLL_LOCK_MASK |
+                                        EGG_VIRTUAL_LOCK_MASK,
                                         &ignored_modifiers);
   
   /* http://bugzilla.gnome.org/show_bug.cgi?id=139605