diff --git a/ChangeLog b/ChangeLog
index 584150599..1bbec0840 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  5 13:56:52 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* src/display.c (event_callback): move a window to the current
+	space on the MapRequest when it's not on the space yet. #100390
+
 2002-12-01  Havoc Pennington  <hp@pobox.com>
 
 	* src/frames.c (get_control): rearrange this function a bit, so
diff --git a/src/display.c b/src/display.c
index 4c8801914..944b8d777 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1458,6 +1458,10 @@ event_callback (XEvent   *event,
         {
           if (window->minimized)
             meta_window_unminimize (window);
+	  if (!meta_workspace_contains_window (window->screen->active_workspace,
+					       window))
+	    meta_window_change_workspace (window,
+					  window->screen->active_workspace);
         }
       break;
     case ReparentNotify: