diff --git a/dix/events.c b/dix/events.c
index 39cf29538f..da9107ea16 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3863,6 +3863,9 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
             if (grabinfo->fromPassiveGrab  &&
                     grabinfo->implicitGrab)
                 mask = grab->deviceMask;
+            else
+                mask = grab->eventMask;
+
             FixUpEventFromWindow(thisDev, xi, grab->window,
                     None, TRUE);