1 files changed, 5 insertions, 4 deletions

diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el
index 6319ff3936b..9d4855fcc1f 100644
--- a/lisp/emacs-lisp/lmenu.el
+++ b/lisp/emacs-lisp/lmenu.el
@@ -135,10 +135,11 @@ The syntax, more precisely:
   (let ((menu (make-lucid-menu-keymap (car menu-desc) (cdr menu-desc)))
         (pos (mouse-pixel-position))
         answer cmd)
-    (while menu
-      (setq answer (x-popup-menu (list (list (nth 1 pos) (nthcdr 2 pos))
-                                       (car pos))
-                                 menu))
+    (while (and menu
+                (setq answer (x-popup-menu (list (list (nth 1 pos)
+                                                       (nthcdr 2 pos))
+                                                 (car pos))
+                                           menu)))
       (setq cmd (lookup-key menu (apply 'vector answer)))
       (setq menu nil)
       (and cmd