diff --git a/ChangeLog b/ChangeLog
index 553dfa159..98d8a24f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-08  Craig Black  <blackc@speakeasy.net>
+
+	* src/display.h: update comment
+	* src/window.c: (meta_window_focus): also set expected
+	focus window when setting input focus. 
+
 2002-08-07  Craig Black  <blackc@speakeasy.net>
 
 	* src/display.c: (meta_display_unshow_desktop): focus
diff --git a/src/display.h b/src/display.h
index c48292fde..95acc6bc5 100644
--- a/src/display.h
+++ b/src/display.h
@@ -153,8 +153,7 @@ struct _MetaDisplay
    */
   MetaWindow *focus_window;
 
-  /* WM_TAKE_FOCUS has been sent but we have not yet 
-   * received the resulting FocusIn event for this window
+  /* window we are expecting a FocusIn event for
    */
   MetaWindow *expected_focus_window;
 
diff --git a/src/window.c b/src/window.c
index f1145179d..66d08d259 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2781,6 +2781,7 @@ meta_window_focus (MetaWindow  *window,
                           window->frame->xwindow,
                           RevertToPointerRoot,
                           CurrentTime);
+          window->display->expected_focus_window = window;
         }
     }
   else
@@ -2796,6 +2797,7 @@ meta_window_focus (MetaWindow  *window,
                           window->xwindow,
                           RevertToPointerRoot,
                           timestamp);
+          window->display->expected_focus_window = window;
         }
       
       if (window->take_focus)