diff --git a/ChangeLog b/ChangeLog
index ddb31daab..a5bc62ecc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-10  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (menu_callback): raise window when moving to
+	another workspace bug #88896
+
+	* src/keybindings.c (switch_to_workspace): raise window when
+	moving between spaces
+	
 2002-08-10  Jorn Baayen  <jorn@nl.linux.org>
 
 	Register window menu icons with the Gtk stock system, instead
diff --git a/src/keybindings.c b/src/keybindings.c
index b128fdce0..2f3e1a1b0 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -2013,6 +2013,7 @@ switch_to_workspace (MetaDisplay *display,
     {
       /* Removes window from other spaces */
       meta_window_change_workspace (move_window, workspace);
+      meta_window_raise (move_window);
     }
 }
 
diff --git a/src/window.c b/src/window.c
index 72aeb34df..2a3b9243d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5679,6 +5679,7 @@ menu_callback (MetaWindowMenu *menu,
                 meta_window_change_workspace (window,
                                               workspace);
                 meta_workspace_activate (workspace);
+                meta_window_raise (window);
               }
             else
               meta_warning ("Workspace %d doesn't exist\n", workspace_index);