diff --git a/ChangeLog b/ChangeLog
index cf83f50fa..4584581c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-10-08  Elijah Newren  <newren@math.utah.edu>
+
+         Alter the meaning of expected_focus_window; doesn't affect
+	 current operation but assists in fixing some other bugs
+	 (#154598)
+	
+	* src/display.c (meta_display_focus_the_no_focus_window): set the
+	expected_focus_window to NULL.
+
+	* src/window.c (meta_window_notify_focus): don't NULL the
+	expected_focus_window when that window receives a FocusIn event
+
 2004-10-04  Elijah Newren  <newren@math.utah.edu>
 
 	* src/display.c (event_callback): if the root window gets focused,
diff --git a/src/display.c b/src/display.c
index ca949331f..6fffee1bf 100644
--- a/src/display.c
+++ b/src/display.c
@@ -4593,6 +4593,7 @@ meta_display_focus_the_no_focus_window (MetaDisplay *display,
                   display->no_focus_window,
                   RevertToPointerRoot,
                   timestamp);
+  display->expected_focus_window = NULL;
   meta_display_remove_autoraise_callback (display);
 }
 
diff --git a/src/window.c b/src/window.c
index 3460f8dec..95300ad7a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4303,9 +4303,6 @@ meta_window_notify_focus (MetaWindow *window,
     
   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,