diff --git a/ChangeLog b/ChangeLog
index c8cbd9440c..b728bfbbc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-09  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate)
+	<WM_MOUSELEAVE>: If we don't know where we went, and have
+	generated a leave event, set current_window to the root
+	window. This assures we will generate proper enter and leave
+	events for popup windows. (#325521)
+
 2006-02-08  John Ehresman  <jpe@wingware.com>
 
 	* gdk/win32/gdkevents-win32.c (gdk_event_translate)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c8cbd9440c..b728bfbbc3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-02-09  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate)
+	<WM_MOUSELEAVE>: If we don't know where we went, and have
+	generated a leave event, set current_window to the root
+	window. This assures we will generate proper enter and leave
+	events for popup windows. (#325521)
+
 2006-02-08  John Ehresman  <jpe@wingware.com>
 
 	* gdk/win32/gdkevents-win32.c (gdk_event_translate)
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 52d957d609..a0235984b0 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2832,6 +2832,7 @@ gdk_event_translate (MSG  *msg,
 	  synthesize_enter_or_leave_event (current_window, msg, 
 					   GDK_LEAVE_NOTIFY, GDK_CROSSING_NORMAL, detail,
 					   current_x, current_y);
+	  assign_object (&current_window, _gdk_root);
 	}
       else
 	{