Index: src/display.c
===================================================================
RCS file: /cvs/gnome/metacity/src/display.c,v
retrieving revision 1.234
diff -p -u -r1.234 display.c
--- src/display.c	4 Oct 2004 21:21:38 -0000	1.234
+++ src/display.c	5 Oct 2004 18:50:51 -0000
@@ -4593,6 +4593,7 @@ meta_display_focus_the_no_focus_window (
                   display->no_focus_window,
                   RevertToPointerRoot,
                   timestamp);
+  display->expected_focus_window = NULL;
   meta_display_remove_autoraise_callback (display);
 }
 
Index: src/window.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window.c,v
retrieving revision 1.347
diff -p -u -r1.347 window.c
--- src/window.c	4 Oct 2004 21:09:08 -0000	1.347
+++ src/window.c	5 Oct 2004 18:50:51 -0000
@@ -4303,9 +4303,6 @@ meta_window_notify_focus (MetaWindow *wi
     
   if (event->type == FocusIn)
     {
-      if (window->display->expected_focus_window == window)
-        window->display->expected_focus_window = NULL;
-
       if (window != window->display->focus_window)
         {
           meta_topic (META_DEBUG_FOCUS,
