diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c
index b9e872b51..d36723e95 100644
--- a/win/win32/mswproc.c
+++ b/win/win32/mswproc.c
@@ -1429,7 +1429,10 @@ char mswin_yn_function(const char *question, const char *choices,
     /* Only here if main window is not present */
     while (result<0) {
         ShowCaret(mswin_hwnd_from_winid(WIN_MESSAGE));
-	ch=lowc(mswin_nhgetch());
+	ch=mswin_nhgetch();
+	if (choices == ynchars || choices == ynqchars ||
+		choices == ynaqchars || choices == ynNaqchars)
+	    ch = lowc(ch);
         HideCaret(mswin_hwnd_from_winid(WIN_MESSAGE));
 	if (ch=='\033') {
 	    result=yn_esc_map;