diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 93768dac..f44f8aa7 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -899,6 +899,11 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
 
     BScreen *screen = searchScreen(ue.event);
 
+    if (screen) {
+        /* Ignore all EnterNotify events until the pointer actually moves */
+        screen->focusControl().ignoreAtPointer();
+    }
+
     if (ue.event != ue.window && (!screen || !ue.send_event)) {
         return;
     }