1 files changed, 1 insertions, 1 deletions
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index 6332673da..983b260f6 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -842,7 +842,7 @@ int menuwindow::handle_part1(int e) {
       if (pp.current_item && (!pp.menubar || pp.menu_number > 0) &&
           pp.current_item->activevisible() && pp.current_item->submenu() && !pp.current_item->callback_)
         goto RIGHT;
-      pp.state = DONE_STATE;
+      if (pp.current_item && pp.current_item->activevisible()) pp.state = DONE_STATE;
       return 1;
     case FL_Escape:
       setitem(0, -1, 0);