diff --git a/source/common/engine/d_event.cpp b/source/common/engine/d_event.cpp
index 6534b8d9a..b42761254 100644
--- a/source/common/engine/d_event.cpp
+++ b/source/common/engine/d_event.cpp
@@ -42,6 +42,7 @@
 #include "m_joy.h"
 #include "vm.h"
 #include "cheathandler.h"
+#include "gamestate.h"
 
 bool G_Responder(event_t* ev);
 
@@ -70,6 +71,8 @@ void D_ProcessEvents (void)
 			continue;
 		if (ev->type == EV_DeviceChange)
 			UpdateJoystickMenu(I_UpdateDeviceList());
+		if (gamestate == GS_INTRO)
+			continue;
 		if (C_Responder (ev))
 			continue;				// console ate the event
 		if (M_Responder (ev))
diff --git a/source/games/duke/src/gameloop.cpp b/source/games/duke/src/gameloop.cpp
index 50b443e0b..8f535bf09 100644
--- a/source/games/duke/src/gameloop.cpp
+++ b/source/games/duke/src/gameloop.cpp
@@ -387,10 +387,10 @@ bool GameTicker()
 
 void startmainmenu()
 {
+	gamestate = GS_DEMOSCREEN;
 	M_StartControlPanel(false);
 	M_SetMenu(NAME_Mainmenu);
 	FX_StopAllSounds();
-	gamestate = GS_DEMOSCREEN;
 }
 
 //---------------------------------------------------------------------------