1 files changed, 17 insertions, 0 deletions

diff --git a/src/xmenu.c b/src/xmenu.c
index fee66df9c0d..5cc92422007 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -2775,6 +2775,23 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
       y -= (uly + height) - dispheight;
       uly = dispheight - height;
     }
+#ifndef HAVE_X_WINDOWS
+  if (FRAME_HAS_MINIBUF_P (f) && uly+height > dispheight - 1)
+    {
+      /* Move the menu away of the echo area, to avoid overwriting the
+         menu with help echo messages or vice versa.  */
+      if (BUFFERP (echo_area_buffer[0]) && WINDOWP (echo_area_window))
+        {
+          y -= WINDOW_TOTAL_LINES (XWINDOW (echo_area_window));
+          uly -= WINDOW_TOTAL_LINES (XWINDOW (echo_area_window));
+        }
+      else
+        {
+          y--;
+          uly--;
+        }
+    }
+#endif
   if (ulx < 0) x -= ulx;
   if (uly < 0) y -= uly;