diff --git a/src/g_input.h b/src/g_input.h
index 5739e097e..97290eb89 100644
--- a/src/g_input.h
+++ b/src/g_input.h
@@ -38,7 +38,7 @@ typedef enum
 	KEY_HAT1 = KEY_JOY1 + JOYBUTTONS,
 	KEY_AXIS1 = KEY_HAT1 + JOYHATS*4,
 
-	KEY_MOUSE1 = KEY_AXIS1 + JOYAXISSET*4,
+	KEY_MOUSE1 = KEY_AXIS1 + JOYAXISSET*2*2, // 4 sets of 2 axes, each with positive & negative
 	KEY_MOUSEMOVE = KEY_MOUSE1 + MOUSEBUTTONS,
 	KEY_MOUSEWHEELUP = KEY_MOUSEMOVE + 4,
 	KEY_MOUSEWHEELDOWN = KEY_MOUSEWHEELUP + 1,
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 472e3a09e..009448558 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -862,7 +862,7 @@ boolean M_Responder(event_t *ev)
 		}
 #endif
 
-		if (G_PlayerInputDown(0, gc_start, true) == true)
+		if (CON_Ready() == false && G_PlayerInputDown(0, gc_start, true) == true)
 		{
 			if (chat_on)
 			{
@@ -1516,17 +1516,20 @@ void M_Ticker(void)
 		}
 	}
 
-	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	if (menuactive == true)
 	{
-		if (menucmd[i].delay > 0)
+		for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 		{
-			menucmd[i].delay--;
+			if (menucmd[i].delay > 0)
+			{
+				menucmd[i].delay--;
+			}
 		}
-	}
 
-	if (noFurtherInput == false)
-	{
-		M_HandleMenuInput();
+		if (noFurtherInput == false)
+		{
+			M_HandleMenuInput();
+		}
 	}
 
 	if (currentMenu->tickroutine)