diff --git a/ChangeLog b/ChangeLog
index b2661166..622a763f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 	* src/text.c (do_spell, do_formatter): Plug three tiny memory leaks.
 	* src/text.c (do_alt_speller, do_formatter): There is no need here to
 	reinitialize the windows; it will be done when polling the keybuffer.
+	* src/winio.c (do_credits): Correctly restore the settings of NO_HELP
+	and MORE_SPACE.
 
 2015-12-31  Benno Schulenberg  <bensberg@justemail.net>
 	* src/text.c (do_formatter): Restore the cursor position differently.
diff --git a/src/winio.c b/src/winio.c
index bcf71d15..eae0276d 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -3425,11 +3425,11 @@ void do_credits(void)
     if (kbinput != ERR)
 	ungetch(kbinput);
 
-    if (!old_more_space || !old_no_help) {
+    if (!old_more_space)
 	UNSET(MORE_SPACE);
+    if (!old_no_help)
 	UNSET(NO_HELP);
-	window_init();
-    }
+    window_init();
 
     curs_set(1);
     nodelay(edit, FALSE);