diff --git a/src/cmd.c b/src/cmd.c
index 1af068e7f..41f08652b 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -2398,6 +2398,7 @@ end_of_input()
 #endif
 	    if (program_state.something_worth_saving) (void) dosave0();
 #endif
+	exit_nhwindows((char *)0);
 	clearlocks();
 	terminate(EXIT_SUCCESS);
 }