diff --git a/ChangeLog b/ChangeLog
index c737b6610..fdf5d6987 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-02-28  Elijah Newren  <newren@gmail.com>
+
+	Patch from Aidan Delaney to make sure that icons in the alt-tab
+	popup are dimmed for all hidden windows, not just minimized ones.
+	Fixes #168455.
+
+	* src/screen.c: (meta_screen_ensure_tab_popup): make use
+	meta_window_showing_on_its_workspace() instead of just checking if
+	the window is minimized.
+
 2005-02-25  Elijah Newren  <newren@gmail.com>
 
 	Prevent the visual bell from changing the focus window.  Fixes
diff --git a/src/screen.c b/src/screen.c
index 793c81534..8bba50667 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1163,7 +1163,7 @@ meta_screen_ensure_tab_popup (MetaScreen *screen,
       entries[i].title = window->title;
       entries[i].icon = window->icon;
       entries[i].blank = FALSE;
-      entries[i].minimized = window->minimized;
+      entries[i].minimized = !meta_window_showing_on_its_workspace (window);
       entries[i].demands_attention = window->wm_state_demands_attention;
       
       if (!window->minimized || !meta_window_get_icon_geometry (window, &r))