diff --git a/ChangeLog b/ChangeLog
index 594449ac1..af935ff14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-02-07  Thomas Thurman  <tthurman@gnome.org>
+
+        Windows demanding attention should never appear in the
+        alt-tab list unless they're of a type which might have appeared
+        there anyway.  This solves a problem under AWN where docks which were
+        marked as demanding attention appeared in all alt-tab lists;
+        they were irrelevant and it was impossible to remove them from the
+        lists.
+
+	* src/core/display.c:
+
 2009-02-07  Thomas Thurman  <tthurman@gnome.org>
 
 	* src/ui/theme.c: some commenting
diff --git a/src/core/display.c b/src/core/display.c
index 91ca5f168..ef06d6a94 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -4434,7 +4434,8 @@ meta_display_get_tab_list (MetaDisplay   *display,
 
         /* Check to see if it demands attention */
         if (l_window->wm_state_demands_attention && 
-            l_window->workspace!=workspace) 
+            l_window->workspace!=workspace &&
+            IN_TAB_CHAIN (l_window, type)) 
           {
             /* if it does, add it to the popup */
             tab_list = g_list_prepend (tab_list, l_window);