2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e01d40..ce97c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc2:
 *06/06/19:
+   * Try ignoring NotifyUngrab EnterNotify events for focus (Simon)
+     - should fix incorrect focus reverts when menus etc closed with 
+       mouse focus, but possibly have side effects, do tell...)
+     Window.cc
    * Fix menu placement issue with (vertical) xinerama (Simon)
      - note, doesn't fix "submenus open on wrong screen" issue, that requires
        some more serious data movement.
diff --git a/src/Window.cc b/src/Window.cc
index 13167e7..7703f96 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3013,7 +3013,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
 void FluxboxWindow::enterNotifyEvent(XCrossingEvent &ev) {
 
     // ignore grab activates, or if we're not visible
-    if (ev.mode == NotifyGrab ||
+    if (ev.mode == NotifyGrab || ev.mode == NotifyUngrab ||
         !isVisible()) {
         return;
     }