diff --git a/sc2/src/sc2code/gameinp.c b/sc2/src/sc2code/gameinp.c
index 259248853..292a890bb 100644
--- a/sc2/src/sc2code/gameinp.c
+++ b/sc2/src/sc2code/gameinp.c
@@ -237,6 +237,11 @@ DoInput (PVOID pInputState, BOOLEAN resetInput)
 		}
 	} while ((*((PINPUT_STATE_DESC)pInputState)->InputFunc)
 			(pInputState));
+	if (resetInput)
+	{
+		TFB_ResetControls ();
+	}
+
 }
 
 BATTLE_INPUT_STATE
diff --git a/sc2/src/sc2code/planets/scan.c b/sc2/src/sc2code/planets/scan.c
index ab8b26c24..6f9849140 100644
--- a/sc2/src/sc2code/planets/scan.c
+++ b/sc2/src/sc2code/planets/scan.c
@@ -712,6 +712,8 @@ PickPlanetSide (PMENU_STATE pMS)
 		SetSemaphore (GraphicsSem);
 		DrawStatusMessage (NULL_PTR);
 		ClearSemaphore (GraphicsSem);
+
+		FlushInput ();
 		if (pMenuState->flash_task)
 		{
 			ConcludeTask (pMenuState->flash_task);