diff --git a/ChangeLog b/ChangeLog
index 932d1d39d..d25eb2959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-24  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (menu_callback): follow windows to their new
+	workspace
+
+	* src/keybindings.c (handle_move_to_workspace): follow windows to
+	their new workspace
+
 2002-05-24  Havoc Pennington  <hp@pobox.com>
 
 	* src/metacity.schemas: add minimize window binding
diff --git a/src/keybindings.c b/src/keybindings.c
index 1aa924b89..5ae2f2711 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -1692,7 +1692,9 @@ handle_move_to_workspace  (MetaDisplay    *display,
   
   if (workspace)
     {
+      /* Activate second, so the window is never unmapped */
       meta_window_change_workspace (window, workspace);
+      meta_workspace_activate (workspace);
     }
   else
     {
diff --git a/src/window.c b/src/window.c
index d4c2c5b49..c7843486f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5263,8 +5263,11 @@ menu_callback (MetaWindowMenu *menu,
                                                           workspace_index);
 
             if (workspace)
-              meta_window_change_workspace (window,
-                                            workspace);
+              {
+                meta_window_change_workspace (window,
+                                              workspace);
+                meta_workspace_activate (workspace);
+              }
             else
               meta_warning ("Workspace %d doesn't exist\n", workspace_index);
           }