diff --git a/ChangeLog b/ChangeLog
index d4a041908a1e57528651e821b2e51dd9c0b53b82..37be69abc8640cb35cc80455bf8767fedaeaef62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	Leave the cursor off during Unicode input, for extra feedback.
 	* src/browser.c (do_browser): Improve the wording of a message.
 	* src/chars.c (is_valid_unicode): Speed up Unicode validation.
+	* src/text.c (do_int_spell_fix): Allow to stop replacing a word
+	without aborting the entire spell-fixing session.
 
 2016-03-28  Benno Schulenberg  <bensberg@justemail.net>
 	* src/winio.c (statusbar): Don't bother putting back the cursor in
diff --git a/src/text.c b/src/text.c
index be7c47c310f88cedaaf5271e3c1638d41fdeb96c..0a93a15e58cb0d946683e521eca4c4bc171fd316 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2448,7 +2448,7 @@ bool do_int_spell_fix(const char *word)
 
 	    if (!canceled && strcmp(word, answer) != 0) {
 		openfile->current_x--;
-		do_replace_loop(TRUE, &canceled, openfile->current,
+		do_replace_loop(TRUE, NULL, openfile->current,
 			&openfile->current_x, word);
 	    }