diff --git a/clutter/clutter-gesture-action.c b/clutter/clutter-gesture-action.c
index 1575391df..b423e9b77 100644
--- a/clutter/clutter-gesture-action.c
+++ b/clutter/clutter-gesture-action.c
@@ -133,6 +133,18 @@ stage_captured_event_cb (ClutterActor       *stage,
     {
     case CLUTTER_MOTION:
       {
+        ClutterModifierType mods = clutter_event_get_state (event);
+
+        /* we might miss a button-release event in case of grabs,
+         * so we need to check whether the button is still down
+         * during a motion event
+         */
+        if (!(mods & CLUTTER_BUTTON1_MASK))
+          {
+            cancel_gesture (action);
+            return FALSE;
+          }
+
         clutter_event_get_coords (event, &priv->last_motion_x,
                                          &priv->last_motion_y);