diff --git a/Ghidra/Framework/Docking/src/main/java/docking/menu/keys/MenuKeyHandler.java b/Ghidra/Framework/Docking/src/main/java/docking/menu/keys/MenuKeyHandler.java
index fd4d9dbfd3..d3386e6de8 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/menu/keys/MenuKeyHandler.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/menu/keys/MenuKeyHandler.java
@@ -169,6 +169,9 @@ abstract class MenuKeyHandler {
 		}
 
 		int itemCount = getItemCount(popup);
+		if (itemCount == 0) {
+			return -1;
+		}
 
 		// handle wrapping around to the top again
 		int updatedOffset = offset >= itemCount ? offset % itemCount : offset;