diff --git a/ChangeLog b/ChangeLog
index beaa51d28..f4ba1d433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-03  Elijah Newren  <newren@gmail.com>
+
+	Patch from Ross Cohen to make alt-esc consistent with alt-tab by
+	leaving stacking of unselected windows unchanged.  Fixes #314285.
+
+	* src/keybindings.c (process_tab_grab): before raising and showing
+	the next candidate, reset the stack positions to what they were
+	at the beginning of the grab
+
 2005-10-03  Elijah Newren  <newren@gmail.com>
 
 	Patch from Ross Cohen to make alt-esc (show windows instantly)
diff --git a/src/keybindings.c b/src/keybindings.c
index 921394718..54fad8b57 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -2528,7 +2528,10 @@ process_tab_grab (MetaDisplay *display,
            */
           Window target_xwindow;
           MetaWindow *target_window;
-          
+
+          meta_stack_set_positions (screen->stack,
+                                    display->grab_old_window_stacking);
+
           target_xwindow =
             (Window) meta_ui_tab_popup_get_selected (screen->tab_popup);
           target_window =