1 files changed, 9 insertions, 5 deletions

diff --git a/lisp/imenu.el b/lisp/imenu.el
index fb8b3de662b..1949f2f48f7 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -911,11 +911,15 @@ to `imenu-update-menubar'.")
         (setq index-alist (imenu--split-submenus index-alist))
         (let* ((menu (imenu--split-menu index-alist
                                         (buffer-name)))
-               (menu1 (imenu--create-keymap (car menu)
-                                            (cdr (if (< 1 (length (cdr menu)))
-                                                     menu
-                                                   (car (cdr menu))))
-                                            'imenu--menubar-select)))
+               (menu1 (imenu--create-keymap
+                       (car menu)
+                       (cdr (if (or (< 1 (length (cdr menu)))
+                                    ;; Have we a non-nested single entry?
+                                    (atom (cdadr menu))
+                                    (atom (cadadr menu)))
+                                menu
+                              (car (cdr menu))))
+                       'imenu--menubar-select)))
           (setcdr imenu--menubar-keymap (cdr menu1)))))))
 
 (defun imenu--menubar-select (item)