diff --git a/client/displayservers/X11/x11.c b/client/displayservers/X11/x11.c
index 5099c949..18ae2398 100644
--- a/client/displayservers/X11/x11.c
+++ b/client/displayservers/X11/x11.c
@@ -993,8 +993,10 @@ static void x11XInputEvent(XGenericEventCookie *cookie)
     {
       atomic_store(&x11.lastWMEvent, microtime());
       XILeaveEvent *xie = cookie->data;
+
       if (!x11.entered || xie->event != x11.window ||
-          button_state != 0 || app_isCaptureMode())
+          button_state != 0 || app_isCaptureMode() ||
+          xie->mode == NotifyGrab)
         return;
 
       app_updateCursorPos(xie->event_x, xie->event_y);