diff --git a/ChangeLog b/ChangeLog
index 0a12670ce5..c5938eaa78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-17  Richard Hult  <richard@imendio.com>
+
+	* gdk/quartz/gdkevents-quartz.c
+	(_gdk_quartz_events_update_mouse_window): Highlight the mouse
+	window when event debugging is enabled.
+
 2008-02-16  Richard Hult  <richard@imendio.com>
 
 	* gdk/quartz/gdkevents-quartz.c (create_scroll_event): Add state
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index e8418878dd..5bc0367fdf 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -885,6 +885,11 @@ _gdk_quartz_events_update_mouse_window (GdkWindow *window)
   if (window == current_mouse_window)
     return;
 
+#ifdef G_ENABLE_DEBUG
+  if (_gdk_debug_flags & GDK_DEBUG_EVENTS)
+    _gdk_quartz_window_debug_highlight (window);
+#endif /* G_ENABLE_DEBUG */  
+
   if (window)
     g_object_ref (window);
   if (current_mouse_window)