diff --git a/ChangeLog b/ChangeLog
index 7b7fc7713..928fc023c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-15  Elijah Newren  <newren@math.utah.edu>
+
+	Fix unwanted loss of focus to the mouse window when using keynav
+	(fixes #101190)
+
+	* src/display.c (event_callback): Ignore EnterNotify events with
+	xcrossing.mode of either NotifyGrab or NotifyUngrab
+
 2004-09-15  Elijah Newren  <newren@math.utah.edu>
 
 	Focus correct window after minimizing via the tasklist (fixes
diff --git a/src/display.c b/src/display.c
index dbf8daa4f..0b94758c6 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1677,6 +1677,8 @@ event_callback (XEvent   *event,
         meta_window_handle_mouse_grab_op_event (window, event);
       /* do this even if window->has_focus to avoid races */
       else if (window && !serial_is_ignored (display, event->xany.serial) &&
+               event->xcrossing.mode != NotifyGrab && 
+               event->xcrossing.mode != NotifyUngrab &&
                event->xcrossing.detail != NotifyInferior &&
                meta_display_focus_sentinel_clear (display))
         {