diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c
index ffb535a81..ac5ea93ad 100644
--- a/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/evdev/clutter-device-manager-evdev.c
@@ -585,11 +585,12 @@ notify_button (ClutterInputDevice *input_device,
       break;
 
     default:
-      button_nr = button - BTN_MOUSE + 1;
+      /* For compatibility reasons, all additional buttons go after the old 4-7 scroll ones */
+      button_nr = button - (BTN_LEFT - 1) + 4;
       break;
     }
 
-  if (G_UNLIKELY (button_nr < 1 || button_nr > 8))
+  if (button_nr < 1 || button_nr > 12)
     {
       g_warning ("Unhandled button event 0x%x", button);
       return;