diff --git a/ChangeLog b/ChangeLog
index 1e009698d..888fcb990 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-29  Havoc Pennington  <hp@redhat.com>
+
+	* src/delete.c (meta_window_delete): don't move the focus after
+	you click the close button on a window. bug #108706
+
 2003-09-29  Havoc Pennington  <hp@redhat.com>
 
 	* src/main.c (find_accessibility_module): fix warnings (one was a
diff --git a/src/delete.c b/src/delete.c
index 2d30e8d75..ced572679 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -387,6 +387,10 @@ meta_window_delete (MetaWindow  *window,
   
   if (window->has_focus)
     {
+      /* FIXME Clean this up someday 
+       * http://bugzilla.gnome.org/show_bug.cgi?id=108706
+       */
+#if 0
       /* This is unfortunately going to result in weirdness
        * if the window doesn't respond to the delete event.
        * I don't know how to avoid that though.
@@ -396,6 +400,11 @@ meta_window_delete (MetaWindow  *window,
                   window->desc);
       meta_workspace_focus_mru_window (window->screen->active_workspace,
                                        window);
+#else
+      meta_topic (META_DEBUG_FOCUS,
+                  "Not unfocusing %s on delete/kill\n",
+                  window->desc);
+#endif
     }
   else
     {