diff --git a/ChangeLog b/ChangeLog
index 179937d056..07e6eebc3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-19  Michael Natterer  <mitch@gimp.org>
+
+	* app/display/gimpdisplayshell.c (gimp_display_shell_new): added
+	runtime check for GTK+ >= 2.4.0 and make sure the menubar's accels
+	can be invoked even if the menubar is invisible (workaround for
+	bug #137151).
+
 2004-03-19  Michael Natterer  <mitch@gimp.org>
 
 	* app/gui/color-notebook.c (color_notebook_new)
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index e90180e018..57d7c39e4d 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -657,6 +657,14 @@ gimp_display_shell_new (GimpDisplay     *gdisp,
   if (shell->options->show_menubar)
     gtk_widget_show (menubar);
 
+  /*  make sure we can activate accels even if the menubar is invisible
+   *  (see http://bugzilla.gnome.org/show_bug.cgi?id=137151)
+   */
+  if (! gtk_check_version (2, 4, 0))
+    g_signal_connect (menubar, "can-activate-accel",
+                      G_CALLBACK (gtk_true),
+                      NULL);
+
   /*  active display callback  */
   g_signal_connect (menubar, "button_press_event",
                     G_CALLBACK (gimp_display_shell_events),