diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index af90587f76..1a1c54ddff 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -295,7 +295,8 @@ gdk_display_open (const gchar *display_name)
 	    /* keep this in sync with _gdk_keymap_state_changed() */ 
 	    XkbSelectEventDetails (display_x11->xdisplay,
 				   XkbUseCoreKbd, XkbStateNotify,
-				   XkbGroupLockMask, XkbGroupLockMask);
+				   XkbAllStateComponentsMask,
+                                   XkbGroupLockMask);
 
 	    XkbSetDetectableAutoRepeat (display_x11->xdisplay,
 					True,