diff --git a/doc/fixes36.1 b/doc/fixes36.1
index eae8a53ff..dee5ca524 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -100,6 +100,8 @@ tty: M-N gave "Unknown command 'M-" with "'." finishing the sentence on the
 	line below it, leaving bogus '.' displayed on the top row of the map
 tty: specifying all four of role, race, gender, and alignment still prompted
 	for confirmation with "Is this ok?" before starting play
+tty: responding with <return> or <enter> duing role, race, &c selection
+	behaved same as <escape> to quit; now it will pick [random] instead
 unix/X11: in top level Makefile, some commented out definitions of VARDATND
 	misspelled pilemark.xbm (as pilemark.xpm)
 unix/tty: fix compile warning about 'has_colors' for some configurations
diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 96cc9b1ee..58dee65a3 100644
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -441,7 +441,8 @@ makepicks:
                     Strcpy(pbuf, "Pick a role or profession");
                     end_menu(win, pbuf);
                     n = select_menu(win, PICK_ONE, &selected);
-                    choice = (n == 1) ? selected[0].item.a_int : ROLE_NONE;
+                    choice = (n == 1) ? selected[0].item.a_int
+                           : (n == 0) ? ROLE_RANDOM : ROLE_NONE;
                     if (selected)
                         free((genericptr_t) selected), selected = 0;
                     destroy_nhwindow(win);
@@ -526,7 +527,7 @@ makepicks:
                         end_menu(win, pbuf);
                         n = select_menu(win, PICK_ONE, &selected);
                         choice = (n == 1) ? selected[0].item.a_int
-                                          : ROLE_NONE;
+                               : (n == 0) ? ROLE_RANDOM : ROLE_NONE;
                         if (selected)
                             free((genericptr_t) selected), selected = 0;
                         destroy_nhwindow(win);
@@ -615,7 +616,7 @@ makepicks:
                         end_menu(win, pbuf);
                         n = select_menu(win, PICK_ONE, &selected);
                         choice = (n == 1) ? selected[0].item.a_int
-                                          : ROLE_NONE;
+                               : (n == 0) ? ROLE_RANDOM : ROLE_NONE;
                         if (selected)
                             free((genericptr_t) selected), selected = 0;
                         destroy_nhwindow(win);
@@ -700,7 +701,7 @@ makepicks:
                         end_menu(win, pbuf);
                         n = select_menu(win, PICK_ONE, &selected);
                         choice = (n == 1) ? selected[0].item.a_int
-                                          : ROLE_NONE;
+                               : (n == 0) ? ROLE_RANDOM : ROLE_NONE;
                         if (selected)
                             free((genericptr_t) selected), selected = 0;
                         destroy_nhwindow(win);