1 files changed, 6 insertions, 3 deletions

diff --git a/src/menu.c b/src/menu.c
index 3b1d7402571..990a74b92e3 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1127,9 +1127,12 @@ x_popup_menu_1 (Lisp_Object position, Lisp_Object menu)
 
     /* Decode the first argument: find the window and the coordinates.  */
     if (EQ (position, Qt)
-        || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)
-                                 || EQ (XCAR (position), Qtab_bar)
-                                 || EQ (XCAR (position), Qtool_bar))))
+        || (CONSP (position)
+            && (EQ (XCAR (position), Qmenu_bar)
+                || EQ (XCAR (position), Qtab_bar)
+                || (CONSP (XCDR (position))
+                    && EQ (XCAR (XCDR (position)), Qtab_bar))
+                || EQ (XCAR (position), Qtool_bar))))
       {
         get_current_pos_p = 1;
       }