diff --git a/lib/hcrypto/ui.c b/lib/hcrypto/ui.c
index f6f8a1ffe..e32bb9a0b 100644
--- a/lib/hcrypto/ui.c
+++ b/lib/hcrypto/ui.c
@@ -77,7 +77,7 @@ read_string(const char *preprompt, const char *prompt,
     p = buf;
     while(intr_flag == 0){
 	c = ((echo)? _getche(): _getch());
-	if(c == '\n')
+	if(c == '\n' || c == '\r')
 	    break;
 	if(of == 0)
 	    *p++ = c;