Index: src/bell.c
===================================================================
RCS file: /cvs/gnome/metacity/src/bell.c,v
retrieving revision 1.3
diff -p -u -r1.3 bell.c
--- src/bell.c	16 Sep 2004 23:18:22 -0000	1.3
+++ src/bell.c	25 Feb 2005 19:18:43 -0000
@@ -78,6 +78,10 @@ meta_bell_flash_screen (MetaDisplay *dis
       XSync (display->xdisplay, False);
       XUnmapWindow (display->xdisplay, screen->flash_window);
     }
+
+  if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK &&
+      !display->mouse_mode)
+    meta_display_increment_focus_sentinel (display);
   XFlush (display->xdisplay);
 }
 
Index: src/display.c
===================================================================
RCS file: /cvs/gnome/metacity/src/display.c,v
retrieving revision 1.255
diff -p -u -r1.255 display.c
--- src/display.c	22 Feb 2005 02:11:25 -0000	1.255
+++ src/display.c	25 Feb 2005 19:18:43 -0000
@@ -1830,9 +1830,10 @@ event_callback (XEvent   *event,
             {
             case META_FOCUS_MODE_MOUSE:
               if ((window->frame == NULL || frame_was_receiver) &&
-		  event->xcrossing.mode != NotifyGrab && 
-		  event->xcrossing.mode != NotifyUngrab &&
-		  event->xcrossing.detail != NotifyInferior)
+                  event->xcrossing.mode != NotifyGrab && 
+                  event->xcrossing.mode != NotifyUngrab &&
+                  event->xcrossing.detail != NotifyInferior &&
+                  meta_display_focus_sentinel_clear (display))
                 {
                   if (window == display->expected_focus_window)
                     {
