diff --git a/ChangeLog b/ChangeLog
index 3377697d05..ff1d260cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-14  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkmenu.c (gtk_menu_motion_notify): don't forget to set the
+	state of the synthesized GDK_ENTER_NOTIFY event. Fix taken from
+	maemo-gtk.
+
 2007-02-13  Kristian Rietveld  <kris@imendio.com>
 
 	* gtk/gtktooltip.c (gtk_tooltip_hide_tooltip): stop any
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index efbd567a3b..02a78a239d 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2900,6 +2900,7 @@ gtk_menu_motion_notify  (GtkWidget	   *widget,
 	  send_event->crossing.y_root = event->y_root;
 	  send_event->crossing.x = event->x;
 	  send_event->crossing.y = event->y;
+          send_event->crossing.state = event->state;
 
 	  /* We send the event to 'widget', the currently active menu,
 	   * instead of 'menu', the menu that the pointer is in. This