diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index bc8ea19..c42cabb 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -824,7 +824,7 @@ _gtk_menu_shell_update_mnemonics (GtkMenuShell *menu_shell)
        * dismissing menus.
        */
       mnemonics_visible = target->keyboard_mode &&
-                          ((target->active_menu_item && !found) ||
+                          ((target->active && !found) ||
                            (target == menu_shell &&
                             !target->parent_menu_shell &&
                             gtk_widget_has_grab (GTK_WIDGET (target))));
@@ -841,7 +841,7 @@ _gtk_menu_shell_update_mnemonics (GtkMenuShell *menu_shell)
       else
         gtk_window_set_mnemonics_visible (GTK_WINDOW (toplevel), mnemonics_visible);
 
-      if (target->active_menu_item)
+      if (target->active)
         found = TRUE;
 
       target = GTK_MENU_SHELL (target->parent_menu_shell);
@@ -857,7 +857,7 @@ gtk_menu_shell_key_press (GtkWidget   *widget,
 
   menu_shell->keyboard_mode = TRUE;
 
-  if (!menu_shell->active_menu_item && menu_shell->parent_menu_shell)
+  if (!menu_shell->active && menu_shell->parent_menu_shell)
     return gtk_widget_event (menu_shell->parent_menu_shell, (GdkEvent *)event);
 
   if (gtk_bindings_activate_event (GTK_OBJECT (widget), event))
