--- src/core.c-ORIGINAL	2004-09-04 17:39:47.000000000 -0700
+++ src/core.c	2004-09-04 17:46:43.000000000 -0700
@@ -249,6 +249,12 @@
     meta_bug ("No such frame window 0x%lx!\n", frame_xwindow);
   
   meta_window_lower (window);
+
+  if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK)
+    XSetInputFocus (display->xdisplay,
+                    display->no_focus_window,
+                    RevertToPointerRoot,
+                    CurrentTime);
 }
 
 void
