diff --git a/doc/fixes36.3 b/doc/fixes36.3
index 23780792c..11ac2c882 100644
--- a/doc/fixes36.3
+++ b/doc/fixes36.3
@@ -1,4 +1,4 @@
-$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.57 $ $NHDT-Date: 1560855142 2019/06/18 10:52:22 $
+$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.58 $ $NHDT-Date: 1561018485 2019/06/20 08:14:45 $
 
 This fixes36.3 file is here to capture information about updates in the 3.6.x
 lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -129,6 +129,7 @@ curses: don't convert ^M (or <return> or <enter> key) into ^J; both ^J and ^M
 	off) and ^M is not bound to any command, so accidental <return> won't
 	cause the hero to try to move
 curses: draw map in screen columns 1..79 like tty, rather than in 2..80
+curses: make text windows wider so that help feedback is more readable
 curses+EDIT_GETLIN: when a prompt's answer was preloaded, using ESC to discard
 	it deleted it from the answer buffer but didn't erase it from screen
 tty: re-do one optimization used when status conditions have all been removed
diff --git a/win/curses/cursdial.c b/win/curses/cursdial.c
index 2f2f5fcce..656d3b6a7 100644
--- a/win/curses/cursdial.c
+++ b/win/curses/cursdial.c
@@ -1025,8 +1025,11 @@ menu_win_size(nhmenu *menu)
     /* Try not to wrap headers/normal text lines if possible.  We can
        go wider than half the screen for this purpose if need be */
 
-    if ((maxheaderwidth > maxwidth) && (maxheaderwidth < (term_cols - 2))) {
-        maxwidth = maxheaderwidth;
+    if (maxheaderwidth > maxwidth) {
+        if (maxheaderwidth < (term_cols - 2))
+            maxwidth = maxheaderwidth;
+        else
+            maxwidth = term_cols - 2;
     }
 
     width = maxwidth;