diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index a6e43e4a5..427c226d2 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1889,13 +1889,16 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 	if (*oldtic != I_GetTime())
 	{
 		I_OsPolling();
-#if 0
-		for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
-			G_MapEventsToControls(&events[eventtail]);
-#endif
 
 		if (cl_mode == CL_CONFIRMCONNECT)
+		{
 			D_ProcessEvents(); //needed for menu system to receive inputs
+		}
+		else
+		{
+			for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
+				G_MapEventsToControls(&events[eventtail]);
+		}
 
 		if ((gamekeydown[KEY_ESCAPE] || gamekeydown[KEY_JOY1+1]) || cl_mode == CL_ABORTED)
 		{