diff --git a/ChangeLog b/ChangeLog
index 1774a12b9..620387127 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-25  Elijah Newren  <newren@gmail.com>
+
+	* src/tabpopup.c: (meta_select_workspace_expose_event): ignore
+	sticky windows for non-active workspaces.  Fixes #165259.
+
 2005-01-25  Elijah Newren  <newren@gmail.com>
 
 	* src/window.c: (meta_window_new_with_attrs): set the window state
diff --git a/src/tabpopup.c b/src/tabpopup.c
index 746c02a1f..94c6f381a 100644
--- a/src/tabpopup.c
+++ b/src/tabpopup.c
@@ -842,12 +842,17 @@ meta_select_workspace_expose_event (GtkWidget      *widget,
   while (tmp != NULL)
     {
       MetaWindow *window;
+      gboolean ignoreable_sticky;
 
       window = tmp->data;
 
+      ignoreable_sticky = window->on_all_workspaces &&
+                          workspace != workspace->screen->active_workspace;
+
       if (window->skip_pager || 
           window->minimized || 
-          window->unmaps_pending)
+          window->unmaps_pending ||
+          ignoreable_sticky)
         {
           --n_windows;
         }