diff --git a/src/core/window.c b/src/core/window.c
index b68dcb2b6..47fff926e 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -6497,6 +6497,12 @@ meta_window_handle_mouse_grab_op_event  (MetaWindow         *window,
 
   switch (event->type)
     {
+    case CLUTTER_TOUCH_BEGIN:
+      if (!meta_display_is_pointer_emulating_sequence (window->display, sequence))
+        return FALSE;
+
+      return TRUE;
+
     case CLUTTER_BUTTON_PRESS:
       {
         ClutterModifierType grab_mods = meta_display_get_compositor_modifiers (window->display);
@@ -6529,12 +6535,6 @@ meta_window_handle_mouse_grab_op_event  (MetaWindow         *window,
 
       return TRUE;
 
-    case CLUTTER_TOUCH_BEGIN:
-      /* This will only catch the keybinding and menu cases, just deal with this
-       * like a CLUTTER_TOUCH_UPDATE rather than a CLUTTER_BUTTON_PRESS, and
-       * wait until CLUTTER_TOUCH_END to undo the grab, just so the window
-       * doesn't warp below the finger and remain there.
-       */
     case CLUTTER_TOUCH_UPDATE:
       if (!meta_display_is_pointer_emulating_sequence (window->display, sequence))
         return FALSE;