diff --git a/prboom2/src/m_menu.c b/prboom2/src/m_menu.c
index 1ea0535e2..b34d85b43 100644
--- a/prboom2/src/m_menu.c
+++ b/prboom2/src/m_menu.c
@@ -6028,6 +6028,8 @@ void M_Ticker (void)
 
 void M_StartMessage (const char* string,void* routine,dboolean input)
 {
+  currentMenu = NULL;
+  setup_active = false;
   messageLastMenuActive = menuactive;
   messageToPrint = 1;
   messageString = string;