diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index a653179f7e..78c0ea3d13 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,6 @@
 May 25, 2009
+- Recoverable errors that are caught during the demo loop no longer shut off
+  the menu.
 - Specifying non-existent directories with -savedir or the save_dir cvar now
   attempts to create them.
 - I_CheckNativeMouse() now checks the foreground window to determine if the
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 8ff94da857..ddf7c1a7c4 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -783,7 +783,10 @@ void D_ErrorCleanup ()
 	playeringame[0] = 1;
 	players[0].playerstate = PST_LIVE;
 	gameaction = ga_fullconsole;
-	menuactive = MENU_Off;
+	if (gamestate == GS_DEMOSCREEN)
+	{
+		menuactive = MENU_Off;
+	}
 	insave = false;
 }