1 files changed, 7 insertions, 0 deletions
diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index 04c3d824027..0f83af882ae 100644
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -622,6 +622,13 @@ public final class EmacsView extends ViewGroup
     if (popupActive && !force)
       return false;
 
+    /* Android will permanently cease to display any popup menus at
+       all if the list of menu items is empty.  Prevent this by
+       promptly returning if there are no menu items.  */
+
+    if (menu.menuItems.isEmpty ())
+      return false;
+
     contextMenu = menu;
     popupActive = true;