diff --git a/dix/events.c b/dix/events.c
index 7b698a0d1..37c922053 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2414,14 +2414,12 @@ DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
                 if (deliveries > 0)
                     return deliveries;
             }
-
-            if ((deliveries < 0) ||
-                    (pWin == stopAt) ||
-                    (inputMasks &&
-                     (filter & inputMasks->dontPropagateMask[mskidx])))
-                return 0;
         }
 
+        if ((deliveries < 0) || (pWin == stopAt) ||
+            (inputMasks && (filter & inputMasks->dontPropagateMask[mskidx])))
+            return 0;
+
         if (dev->isMaster && dev->coreEvents)
         {
 
@@ -2439,12 +2437,11 @@ DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
                     if (deliveries > 0)
                         return deliveries;
                 }
-
-                if ((deliveries < 0) ||
-                        (pWin == stopAt) ||
-                        (filter & wDontPropagateMask(pWin)))
-                    return 0;
             }
+
+            if ((deliveries < 0) || (pWin == stopAt) ||
+                (filter & wDontPropagateMask(pWin)))
+                return 0;
         }
 
         child = pWin->drawable.id;