diff --git a/ChangeLog b/ChangeLog
index 435fabf7d3..e08ccdfe45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-06  Richard Hult  <richard@imendio.com>
+
+	* gdk/quartz/gdkevents-quartz.c
+	(_gdk_quartz_events_update_mouse_window): Ignore if the old and new
+	windows are the same.
+
 2007-06-06  Kristian Rietveld  <kris@imendio.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_unrealize): also remove the
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index fc0335fd93..ae58307b79 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -802,6 +802,9 @@ _gdk_quartz_events_get_mouse_window (void)
 void 
 _gdk_quartz_events_update_mouse_window (GdkWindow *window)
 {
+  if (window == current_mouse_window)
+    return;
+
   if (window)
     g_object_ref (window);
   if (current_mouse_window)