diff --git a/ChangeLog b/ChangeLog
index 97c8312112730c0945d02fac56dcd52828d8ca68..fe6e492f3031c24c5f7d8efb207daa424aef4848 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@ CVS code changes since last release -
 	- Removed dual alt_speller variables, oops! (Rocco Corsi)
 - de.po
 	- Revised translations by floki@bigfoot.com.
+- winio.c
+  do_yesno(), nanogetstr():
+	- Removed now unnecessary raw/cbreak combos.
+	
 
 nano-0.9.11 - 06/20/2000
 - New flag "-T" or "--tabsize" to specify how to display tab widths.
diff --git a/winio.c b/winio.c
index 8a0e3a049422a0d2658c34d00664ac4da3781037..ee6e695a0419e451d56b023a2a95e8efdaa0748a 100644
--- a/winio.c
+++ b/winio.c
@@ -237,14 +237,10 @@ int nanogetstr(char *buf, char *def, shortcut s[], int slen, int start_x)
 	strcpy(answer, def);
 	strcpy(inputbuf, def);
     }
-    /* Go into raw mode so we can actually get ^C, for example */
-    raw();
 
     while ((kbinput = wgetch(bottomwin)) != 13) {
 	for (j = 0; j <= slen - 1; j++) {
 	    if (kbinput == s[j].val) {
-		noraw();
-		cbreak();
 		strcpy(answer, "");
 		return s[j].val;
 	    }
@@ -417,8 +413,6 @@ int nanogetstr(char *buf, char *def, shortcut s[], int slen, int start_x)
 
     strncpy(answer, inputbuf, 132);
 
-    noraw();
-    cbreak();
     if (!strcmp(answer, ""))
 	return -2;
     else
@@ -985,8 +979,6 @@ int do_yesno(int all, int leavecursor, char *msg, ...)
     if (leavecursor == 1)
 	reset_cursor();
 
-    raw();
-
     while (ok == -1) {
 	kbinput = wgetch(edit);
 
@@ -1009,8 +1001,6 @@ int do_yesno(int all, int leavecursor, char *msg, ...)
 	    break;
 	}
     }
-    noraw();
-    cbreak();
 
     /* Then blank the screen */
     blank_statusbar_refresh();