diff --git a/ChangeLog b/ChangeLog
index 310c37aafc..0d0bcba309 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-11-24  Matthias Clasen  <mclasen@redhat.com>
+
+	Open submenus on click.  (#128968, Martin Jeppesen)
+	
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
+	activate items with submenus after the timeout, just select 
+	them.
+
+	* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Make
+	submenus popup immediately on click, regardless of popup 
+	delay.
+
 2004-11-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Rework confusing error message.  (#151742,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 310c37aafc..0d0bcba309 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2004-11-24  Matthias Clasen  <mclasen@redhat.com>
+
+	Open submenus on click.  (#128968, Martin Jeppesen)
+	
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
+	activate items with submenus after the timeout, just select 
+	them.
+
+	* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Make
+	submenus popup immediately on click, regardless of popup 
+	delay.
+
 2004-11-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Rework confusing error message.  (#151742,
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 310c37aafc..0d0bcba309 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+2004-11-24  Matthias Clasen  <mclasen@redhat.com>
+
+	Open submenus on click.  (#128968, Martin Jeppesen)
+	
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
+	activate items with submenus after the timeout, just select 
+	them.
+
+	* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Make
+	submenus popup immediately on click, regardless of popup 
+	delay.
+
 2004-11-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Rework confusing error message.  (#151742,
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 310c37aafc..0d0bcba309 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+2004-11-24  Matthias Clasen  <mclasen@redhat.com>
+
+	Open submenus on click.  (#128968, Martin Jeppesen)
+	
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
+	activate items with submenus after the timeout, just select 
+	them.
+
+	* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Make
+	submenus popup immediately on click, regardless of popup 
+	delay.
+
 2004-11-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Rework confusing error message.  (#151742,
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index acbf562715..b1f25ffedc 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -843,9 +843,12 @@ gtk_real_menu_item_select (GtkItem *item)
       gint popup_delay;
 
       if (menu_item->timer)
-	g_source_remove (menu_item->timer);
-
-      popup_delay = get_popup_delay (menu_item);
+	{
+	  g_source_remove (menu_item->timer);
+	  popup_delay = 0;
+	}
+      else
+	popup_delay = get_popup_delay (menu_item);
       
       if (popup_delay > 0)
 	{
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index ebae498dea..a0e5f00deb 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -508,10 +508,10 @@ gtk_menu_shell_button_release (GtkWidget      *widget,
 	      _gtk_menu_item_is_selectable (menu_item))
 	    {
 	      if (GTK_MENU_ITEM (menu_item)->submenu == NULL)
-		{
-		  gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE);
-		  return TRUE;
-		}
+		gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE);
+	      else
+		gtk_menu_item_select (menu_item);
+	      return TRUE;
 	    }
 	  else if (menu_item &&
 		   !_gtk_menu_item_is_selectable (menu_item) &&