diff --git a/ChangeLog b/ChangeLog
index 69032f0c40de93d2ca6a9b47e0f4c8dca167b5f9..4ea58e135ae4a1e4175824f811e3f1b955907909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-15  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (precalc_multicolorinfo): Actually set the intended
+	non-blocking mode for keyboard input.
+
 2014-04-14  Benno Schulenberg  <bensberg@justemail.net>
 	* src/{proto.h,cut.c,nano.c,text.c}: Remove the unused parameter
 	'file_bot' from copy_from_filestruct(), and rename the other.
diff --git a/src/nano.c b/src/nano.c
index aac4afc584326a56532b1cf77f41cfdab675de00..65ab07af9ba50bc8b487062538e6bd35bfe2d0c6 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1861,12 +1861,11 @@ void precalc_multicolorinfo(void)
 	filestruct *fileptr, *endptr;
 	time_t last_check = time(NULL), cur_check = 0;
 
-	/* Let us get keypresses to see if the user is trying to
-	 * start editing.  We may want to throw up a statusbar
-	 * message before starting this later if it takes
-	 * too long to do this routine.  For now silently
-	 * abort if they hit a key. */
-	nodelay(edit, FALSE);
+	/* Let us get keypresses to see if the user is trying to start
+	 * editing.  Later we may want to throw up a statusbar message
+	 * before starting this if it takes too long to do this routine.
+	 * For now silently abort if they hit a key. */
+	nodelay(edit, TRUE);
 
 	for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) {