diff --git a/src/conio/ciolib.c b/src/conio/ciolib.c
index a57a0bac469233fd7067a3812135c224905248b0..c5633302ad6b41f1d2397a94c58dc62ba5046d83 100644
--- a/src/conio/ciolib.c
+++ b/src/conio/ciolib.c
@@ -356,12 +356,12 @@ char *ciolib_cgets(char *str)
 	CIOLIB_INIT();
 	
 	maxlen=*(unsigned char *)str;
-	while((ch=ciolib_getche())!='\n') {
+	while((ch=ciolib_getche())!='\n' && ch !='\r') {
 		switch(ch) {
 			case 0:	/* Skip extended keys */
 				ciolib_getche();
 				break;
-			case '\r':	/* Skip \r (ToDo: Should this be treeated as a \n? */
+			case '\r':	/* Skip \r (ToDo: Should this be treated as a \n? */
 				break;
 			case '\b':
 				if(len==0) {