diff --git a/src/xterm.c b/src/xterm.c
index ad6652fb33c..ff6c71283ec 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10998,7 +10998,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 	    xkey.root = xev->root;
 	    xkey.subwindow = xev->child;
 	    xkey.time = xev->time;
-	    xkey.state = xev->mods.effective;
+	    xkey.state = ((xev->mods.effective & ~(1 << 13 | 1 << 14))
+			  | (xev->group.effective << 13));
 	    xkey.keycode = xev->detail;
 	    xkey.same_screen = True;