1 files changed, 4 insertions, 2 deletions

diff --git a/src/fns.c b/src/fns.c
index 3b16c5743c5..1589176485a 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1132,7 +1132,8 @@ Also accepts Space to mean yes, or Delete to mean no.")
   while (1)
     {
 #ifdef HAVE_X_MENU
-      if (NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
+      if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
+          && using_x_p ())
         {
           Lisp_Object pane, menu;
           pane = Fcons (Fcons (build_string ("Yes"), Qt),
@@ -1233,7 +1234,8 @@ and can edit it until it as been confirmed.")
   CHECK_STRING (prompt, 0);
 
 #ifdef HAVE_X_MENU
-  if (NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
+  if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
+      && using_x_p ())
     {
       Lisp_Object pane, menu, obj;
       pane = Fcons (Fcons (build_string ("Yes"), Qt),