diff --git a/ChangeLog b/ChangeLog
index a36d17ffe..85a0029db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-20  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c (meta_window_show): Ignore all focus and
+	focus-stealing-prevention code in meta_window_show when not
+	showing the window for the first time.  Fixes #167199.
+
 2005-02-20  Elijah Newren  <newren@gmail.com>
 
 	Fix an obscure xinerama placement bug with windows that are too
diff --git a/src/window.c b/src/window.c
index c281b87f9..e4bb6cd05 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1696,7 +1696,8 @@ meta_window_show (MetaWindow *window)
 
   if ( !takes_focus_on_map &&
        window->display->focus_window != NULL &&
-       !place_on_top_on_map )
+       !place_on_top_on_map &&
+       window->showing_for_first_time )
     {
       if (meta_window_is_ancestor_of_transient (window->display->focus_window,
                                                 window))