diff --git a/src/drivers/win/input.cpp b/src/drivers/win/input.cpp
index 46f4ba66..e4bcbfe8 100644
--- a/src/drivers/win/input.cpp
+++ b/src/drivers/win/input.cpp
@@ -321,11 +321,17 @@ void HandleHotkeys()
 void FCEUD_UpdateInput()
 {
 	bool joy=false,mouse=false;
+	EMOVIEMODE FCEUMOVState = FCEUMOV_Mode();
 
+	extern bool justloadedstate;
+	if(((FCEUMOVState != MOVIEMODE_PLAY) && (FCEUMOVState != MOVIEMODE_RECORD)) || !justloadedstate) {
 	KeyboardUpdateState();
 	UpdateJoysticks();
 
 	HandleHotkeys();
+	}
+	justloadedstate = false;
+	
 
 	{
 		for(int x=0;x<2;x++)
@@ -365,7 +371,7 @@ void FCEUD_UpdateInput()
 			UpdateGamepad();
 
 		if(mouse)
-			if(FCEUMOV_Mode() != MOVIEMODE_PLAY)	//FatRatKnight: Moved this if out of the function
+			if(FCEUMOVState != MOVIEMODE_PLAY)	//FatRatKnight: Moved this if out of the function
 				GetMouseData(MouseData);			//A more concise fix may be desired.
 	}
 }
diff --git a/src/fceu.cpp b/src/fceu.cpp
index 7810cc68..7519e326 100644
--- a/src/fceu.cpp
+++ b/src/fceu.cpp
@@ -81,6 +81,7 @@ bool justLagged = false;
 bool frameAdvanceLagSkip = false; //If this is true, frame advance will skip over lag frame (i.e. it will emulate 2 frames instead of 1)
 bool AutoSS = false;		//Flagged true when the first auto-savestate is made while a game is loaded, flagged false on game close
 bool movieSubtitles = true; //Toggle for displaying movie subtitles
+bool justloadedstate = false;
 
 FCEUGI::FCEUGI()
 : filename(0)