diff -r 4764e8436b2a -r f802a75da585 mercurial/patch.py
--- a/mercurial/patch.py	Thu Jun 20 11:40:47 2019 -0700
+++ b/mercurial/patch.py	Thu Jun 20 14:45:52 2019 -0700
@@ -1089,7 +1089,9 @@
             return skipfile, skipfile, skipall, newpatches
         while True:
             resps = messages['help'][operation]
-            r = ui.promptchoice("%s %s" % (query, resps))
+            # IMPORTANT: keep the last line of this prompt short (<40 english
+            # chars is a good target) because of issue6158.
+            r = ui.promptchoice("%s\n(enter ? for help) %s" % (query, resps))
             ui.write("\n")
             if r == 8: # ?
                 for c, t in ui.extractchoices(resps)[1]: