diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index d3c60e903..314989a85 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-24  Andre Klapper <a9016009@gmx.de>
+
+	Fixes #170318
+
+	* gnome-settings-multimedia-keys.c (init_kbd): avoid grabbing all
+	the keyboard when the key code cannot be retrieved.
+
 2006-07-11  Sebastien Bacher  <seb128@debian.org>
 
 	* Makefile.am: fix distclean build target
diff --git a/gnome-settings-daemon/gnome-settings-multimedia-keys.c b/gnome-settings-daemon/gnome-settings-multimedia-keys.c
index ec91971bf..a37da6bdd 100644
--- a/gnome-settings-daemon/gnome-settings-multimedia-keys.c
+++ b/gnome-settings-daemon/gnome-settings-multimedia-keys.c
@@ -433,6 +433,15 @@ init_kbd (Acme *acme)
 			g_free (key);
 			continue;
 		}
+	/*avoid grabbing all the keyboard when KeyCode cannot be retrieved */
+		if (key->keycode == AnyKey)
+		  {
+		    g_warning ("The shortcut key \"%s\" cannot be found on the current system, ignoring the binding", tmp);
+		    g_free (tmp);
+		    g_free (key);
+		    continue;
+		  }
+
 		g_free (tmp);
 
 		keys[i].key = key;