===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/menu.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- src/usr.bin/tmux/menu.c	2020/04/15 16:11:23	1.22
+++ src/usr.bin/tmux/menu.c	2020/04/16 17:20:23	1.23
@@ -1,4 +1,4 @@
-/* $OpenBSD: menu.c,v 1.22 2020/04/15 16:11:23 nicm Exp $ */
+/* $OpenBSD: menu.c,v 1.23 2020/04/16 17:20:23 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -298,6 +298,8 @@
     void *data)
 {
 	struct menu_data	*md;
+	u_int			 i;
+	const char		*name;
 
 	if (c->tty.sx < menu->width + 4 || c->tty.sy < menu->count + 2)
 		return (-1);
@@ -318,7 +320,18 @@
 	md->py = py;
 
 	md->menu = menu;
-	md->choice = -1;
+	if (md->flags & MENU_NOMOUSE) {
+		for (i = 0; i < menu->count; i++) {
+			name = menu->items[i].name;
+			if (name != NULL && *name != '-')
+				break;
+		}
+		if (i != menu->count)
+			md->choice = i;
+		else
+			md->choice = -1;
+	} else
+		md->choice = -1;
 
 	md->cb = cb;
 	md->data = data;