diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index f203a932f7..b2583e3e4f 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -1240,6 +1240,12 @@ XkbPushLockedStateToSlaves(DeviceIntPtr master, int evtype, int key)
 
         dev->key->xkbInfo->state.locked_mods =
             master->key->xkbInfo->state.locked_mods;
+        dev->key->xkbInfo->state.locked_group =
+            master->key->xkbInfo->state.locked_group;
+        dev->key->xkbInfo->state.latched_mods =
+            master->key->xkbInfo->state.latched_mods;
+        dev->key->xkbInfo->state.latched_group =
+            master->key->xkbInfo->state.latched_group;
 
         _XkbApplyState(dev, genStateNotify, evtype, key);
     }