diff --git a/ChangeLog b/ChangeLog
index a3e229b21..ad234494a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-10  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (meta_window_update_unfocused_button_grabs): oops, 
+	unbreak this _again_ - reported by Josh Barrow
+
 2001-12-10  Havoc Pennington  <hp@pobox.com>
 
 	* src/window.c (meta_window_update_unfocused_button_grabs): don't 
diff --git a/src/window.c b/src/window.c
index ecbf1196d..a487a692c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2050,7 +2050,8 @@ meta_window_update_unfocused_button_grabs (MetaWindow *window)
            * do is focus these windows, but pass thru click. What we
            * do now is ignore clicks on them.
            */
-          if (window->type != META_WINDOW_DOCK &&
+          if (!window->has_focus &&
+              window->type != META_WINDOW_DOCK &&
               window->type != META_WINDOW_DESKTOP)
             {
               /* Not focused so grab */