diff --git a/ChangeLog b/ChangeLog
index 8f53a448f..1743c1c39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-25  Havoc Pennington  <hp@redhat.com>
+
+	* src/window.c (meta_window_new): set the current workspace hint
+
 2001-10-25  Havoc Pennington  <hp@pobox.com>
 
 	* src/window.c (meta_window_visible_on_workspace):
diff --git a/src/window.c b/src/window.c
index f89f61f5f..2bf636756 100644
--- a/src/window.c
+++ b/src/window.c
@@ -476,7 +476,7 @@ meta_window_new (MetaDisplay *display, Window xwindow,
 
       meta_workspace_add_window (space, window);
     }
-
+  
   /* Only accept USPosition on normal windows because the app is full
    * of shit claiming the user set -geometry for a dialog or dock
    */
@@ -510,6 +510,9 @@ meta_window_new (MetaDisplay *display, Window xwindow,
        */
       window->on_all_workspaces = TRUE;
     }
+
+  /* for the various on_all_workspaces = TRUE possible above */
+  meta_window_set_current_workspace_hint (window);
   
   /* Put our state back where it should be,
    * passing TRUE for is_configure_request, ICCCM says