diff --git a/win/curses/curswins.c b/win/curses/curswins.c
index 9fe04edd4..52e21db37 100644
--- a/win/curses/curswins.c
+++ b/win/curses/curswins.c
@@ -224,6 +224,10 @@ curses_destroy_win(WINDOW *win)
     delwin(win);
     if (win == activemenu)
         activemenu = NULL;
+    /* during shutdown, RIP window could still be active after mapwin goes
+       away; so, avoid 'if (mapwin)' above when deleting RIP window later */
+    if (win == mapwin)
+        win = mapwin = NULL;
     curses_refresh_nethack_windows();
     nhUse(dummyht);
 }