diff --git a/ChangeLog b/ChangeLog
index 790669ec3..a2300b923 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-02  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c (meta_window_focus): if the window has a modal
+	transient which is being unmanaged, don't focus it.  Fixes the
+	Metacity issue reported in #305362.
+
 2005-05-30  Ray Strode  <rstrode@redhat.com>
 
 	Bug 305564 again.
diff --git a/src/window.c b/src/window.c
index d5bd0ac18..385bc4291 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3519,7 +3519,8 @@ meta_window_focus (MetaWindow  *window,
     }
 
   modal_transient = get_modal_transient (window);
-  if (modal_transient != NULL)
+  if (modal_transient != NULL &&
+      !modal_transient->unmanaging)
     {
       meta_topic (META_DEBUG_FOCUS,
                   "%s has %s as a modal transient, so focusing it instead.\n",