diff --git a/ChangeLog b/ChangeLog
index 339e7f0a2..1bd13cf29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-03  Elijah Newren  <newren@gmail.com>
+
+	Get the tabbing window outline to work with gtk+ 2.8.4 again.
+	Fixes #317528.
+
+	* src/tabpopup.c (display_entry): gtk+ 2.8.4 needs to know the
+	mapped state of its windows (see bug 316180), and since we
+	manually map with gdk_window_show_unraised() we need to manually
+	set the mapped state too
+
 2005-09-05  Elijah Newren  <newren@gmail.com>
 
 	* configure.in: post-release version bump to 2.12.1
diff --git a/src/tabpopup.c b/src/tabpopup.c
index fd880f87c..6d2660dfd 100644
--- a/src/tabpopup.c
+++ b/src/tabpopup.c
@@ -485,8 +485,11 @@ display_entry (MetaTabPopup *popup,
       gdk_region_destroy (region);
   
       /* This should piss off gtk a bit, but we don't want to raise
-       * above the tab popup
+       * above the tab popup.  So, instead of calling gtk_widget_show,
+       * we manually set the window as mapped and then manually map it
+       * with gdk functions.
        */
+      GTK_WIDGET_SET_FLAGS (popup->outline_window, GTK_MAPPED);
       gdk_window_show_unraised (popup->outline_window->window);
     }