diff --git a/ChangeLog b/ChangeLog
index a3312a05b..80e21611f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-14  Federico Mena Quintero  <federico@ximian.com>
+
+	* src/display.c (event_callback): Ignore EnterNotify events when
+	the detail field is set to NotifyInferior.  Fixes #95747.
+
 2002-10-12  Havoc Pennington  <hp@pobox.com>
 
 	* src/metacity.schemas.in: button layout key
diff --git a/src/display.c b/src/display.c
index 1f3ecf34a..e9932a226 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1192,7 +1192,8 @@ event_callback (XEvent   *event,
       break;
     case EnterNotify:
       /* do this even if window->has_focus to avoid races */
-      if (window && !serial_is_ignored (display, event->xany.serial))
+      if (window && !serial_is_ignored (display, event->xany.serial) &&
+	  event->xcrossing.detail != NotifyInferior)
         {
           switch (meta_prefs_get_focus_mode ())
             {