diff --git a/src/backends/x11/meta-seat-x11.c b/src/backends/x11/meta-seat-x11.c
index e320a1e4c..a1d1cc5e1 100644
--- a/src/backends/x11/meta-seat-x11.c
+++ b/src/backends/x11/meta-seat-x11.c
@@ -1506,7 +1506,7 @@ translate_state (XIButtonState   *button_state,
 
   if (button_state)
     {
-      for (i = 1; i < XIMaskLen (button_state->mask_len); i++)
+      for (i = 1; i <= button_state->mask_len * 8; i++)
         {
           if (!XIMaskIsSet (button_state->mask, i))
             continue;