diff --git a/ChangeLog b/ChangeLog
index 908c468577..9ac9d8d71c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-21  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtktooltip.c (_gtk_tooltip_handle_event): always set
+	hide_tooltip to TRUE if we are handling a leave notify event. (Fixes
+	#468245, reported by Dennis Jacobfeuerborn).
+
 2007-08-21  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkpaned.c (gtk_paned_class_init): applied patch from Mikael
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 46ca8179ab..25dc578ebe 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -1223,6 +1223,9 @@ _gtk_tooltip_handle_event (GdkEvent *event)
 	    /* Requested to be hidden? */
 	    hide_tooltip = !return_value;
 
+	    /* Leave notify should override the query function */
+	    hide_tooltip = (event->type == GDK_LEAVE_NOTIFY);
+
 	    /* Is the pointer above another widget now? */
 	    if (GTK_TOOLTIP_VISIBLE (current_tooltip))
 	      hide_tooltip |= has_tooltip_widget != current_tooltip->tooltip_widget;