diff --git a/ChangeLog b/ChangeLog
index 487059735..c44d483db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-19  Iain Holmes  <iain@gnome.org>
+
+	* src/core/window.c: Applied patch from Ed Catmur to fix #528787
+
 2008-05-19  Iain Holmes  <iain@gnome.org>
 
 	* src/include/frame.h
diff --git a/src/core/window.c b/src/core/window.c
index 188663ad3..6d9d314f9 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1055,7 +1055,11 @@ meta_window_free (MetaWindow  *window,
   g_assert (window->display->grab_window != window);
   
   if (window->display->focus_window == window)
-    window->display->focus_window = NULL;
+    {
+      window->display->focus_window = NULL;
+      meta_compositor_set_active_window (window->display->compositor,
+                                         window->screen, NULL);
+    }
 
   if (window->maximized_horizontally || window->maximized_vertically)
     unmaximize_window_before_freeing (window);