1 files changed, 7 insertions, 0 deletions

diff --git a/src/xmenu.c b/src/xmenu.c
index 8eb1c14c368..758b43995ab 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1719,6 +1719,13 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error)
               break;
             }
         }
+      else if (event.type == UnmapNotify)
+        {
+          /* If the menu disappears, there is no need to stay in the
+             loop.  */
+          if (event.xunmap.window == menu->core.window)
+            break;
+        }
 
       XtDispatchEvent (&event);
       if (queue_and_exit