diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 78b9de693a..24699bfa39 100644
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -677,7 +677,7 @@ _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state,
   guint state = 0;
 
   if (mods_state)
-    state = (guint) mods_state->effective;
+    state = (guint) mods_state->base | mods_state->latched | mods_state->locked;
 
   if (buttons_state)
     {