diff --git a/ChangeLog b/ChangeLog
index 1d6e1102c..96364d96a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-07  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (meta_window_notify_focus): drop the mouse button
+	grabs for the focused window; we'll see if this breaks anything. 
+	It should fix #102209
+
 Fri Jun  6 19:27:53 2003  Jonathan Blandford  <jrb@gnome.org>
 
 	* src/metacity.schemas.in: fix the location of the schemas file.
diff --git a/src/window.c b/src/window.c
index 2386c02c9..06fd90f02 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4030,6 +4030,9 @@ meta_window_notify_focus (MetaWindow *window,
 
           /* move into FOCUSED_WINDOW layer */
           meta_window_update_layer (window);
+
+          /* Ungrab click to focus button */
+          meta_display_ungrab_focus_window_button (window->display, window->xwindow);
         }
     }
   else if (event->type == FocusOut ||
@@ -4066,6 +4069,9 @@ meta_window_notify_focus (MetaWindow *window,
 
           /* move out of FOCUSED_WINDOW layer */
           meta_window_update_layer (window);
+
+          /* Re-grab for click to focus */
+          meta_display_grab_focus_window_button (window->display, window->xwindow);
         }
     }