diff --git a/src/g_game.c b/src/g_game.c
index 0dd24ecb..53939213 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1956,7 +1956,14 @@ boolean G_Responder(event_t *ev)
 		)
 		{
 			paused = !paused;
-			if (paused)
+
+			if (demo.rewinding)
+			{
+				G_ConfirmRewind(leveltime);
+				paused = true;
+				S_PauseAudio();
+			}
+			else if (paused)
 				S_PauseAudio();
 			else
 				S_ResumeAudio();
diff --git a/src/m_menu.c b/src/m_menu.c
index 7a4ea678..cbbff403 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -5184,6 +5184,8 @@ void M_ReplayHut(INT32 choice)
 	M_SetupNextMenu(&MISC_ReplayHutDef);
 	G_SetGamestate(GS_TIMEATTACK);
 
+	demo.rewinding = false;
+
 	S_ChangeMusicInternal("replst", true);
 }