diff --git a/dix/events.c b/dix/events.c
index 7b503ac4e..04342fc0f 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4690,6 +4690,8 @@ FocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
 
     if (!numFoci)
         sendevent = TRUE;
+    else if (mode == NotifyUngrab && FOCUS_SEMAPHORE_ISSET(pWin, dev))
+        sendevent = TRUE;
 
     if (sendevent)
     {