diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index d97a16c4b..8dd11eaea 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-31  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-settings-keyboard-xkb.c:
+	(gnome_settings_keyboard_xkb_init): don't install the same filter
+	twice; we already install it for all windows, so we don't need
+	another one for the root window (fixes bug #382504)
+
 2007-01-30  Jens Granseuer  <jensgr@gmx.net>
 
 	* gsd-media-keys-window.c: (gsd_media_keys_window_new): property
diff --git a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
index 2614bd559..65be12410 100644
--- a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
+++ b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
@@ -416,10 +416,6 @@ gnome_settings_keyboard_xkb_init (GConfClient * client)
 		gdk_window_add_filter (NULL, (GdkFilterFunc)
 				       gnome_settings_keyboard_xkb_evt_filter,
 				       NULL);
-		gdk_window_add_filter (gdk_get_default_root_window (),
-				       (GdkFilterFunc)
-				       gnome_settings_keyboard_xkb_evt_filter,
-				       NULL);
 		xkl_engine_start_listen (xkl_engine,
 					 XKLL_MANAGE_LAYOUTS |
 					 XKLL_MANAGE_WINDOW_STATES);