diff --git a/ChangeLog b/ChangeLog
index 039ac35a2..9c33d7216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-07  Matt Kraai  <kraai@ftfbs.org>
+
+	* src/core/display.c: Only skip the first window in
+        the alt-tab chain if it's actually the current window
+        (urgent windows on other workspaces may precede it).
+        Fixes #535887.
+
 2009-02-05  Thomas Thurman  <tthurman@gnome.org>
 
         Lines where x1==x2 or y1==y2 may have the second element
diff --git a/src/core/display.c b/src/core/display.c
index cd56da841..91ca5f168 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -4484,7 +4484,7 @@ meta_display_get_tab_next (MetaDisplay   *display,
   else
     {
       skip = display->focus_window != NULL && 
-             IN_TAB_CHAIN (display->focus_window, type);
+             tab_list->data == display->focus_window;
       if (backward)
         ret = find_tab_backward (display, type, screen, workspace,
                                  tab_list, skip);