diff --git a/src/core/events.c b/src/core/events.c
index 2edbeb00c..7c23ac174 100644
--- a/src/core/events.c
+++ b/src/core/events.c
@@ -269,18 +269,6 @@ meta_display_handle_event (MetaDisplay        *display,
         }
     }
 
-  if (event->type == CLUTTER_SCROLL && meta_prefs_get_mouse_button_mods () > 0)
-    {
-      ClutterModifierType grab_mods;
-
-      grab_mods = meta_display_get_compositor_modifiers (display);
-      if ((clutter_event_get_state (event) & grab_mods) != 0)
-        {
-          bypass_wayland = TRUE;
-          goto out;
-        }
-    }
-
   if (event->type != CLUTTER_DEVICE_ADDED &&
       event->type != CLUTTER_DEVICE_REMOVED)
     {
@@ -384,6 +372,18 @@ meta_display_handle_event (MetaDisplay        *display,
         }
     }
 
+  if (event->type == CLUTTER_SCROLL && meta_prefs_get_mouse_button_mods () > 0)
+    {
+      ClutterModifierType grab_mods;
+
+      grab_mods = meta_display_get_compositor_modifiers (display);
+      if ((clutter_event_get_state (event) & grab_mods) != 0)
+        {
+          bypass_wayland = TRUE;
+          goto out;
+        }
+    }
+
   if (display->current_pad_osd)
     {
       bypass_wayland = TRUE;