diff --git a/changelog.txt b/changelog.txt
index 9f0f9b77..cad5d32d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,5 @@
 11-may-2010 - ugetab - Win32 - Added Ram Search hotkeys for the first 6 search types in the list.
-10-may-2010 - adelikat - Loadstate while in record mode update input display
+10-may-2010 - adelikat - Loadstate while movie is loaded updates input display
 10-may-2010 - ugetab - Added gui.getpixel() which gets any gui.pixel() set pixel colors, and possibly other functions. Added emu.getscreenpixel() which gets the RGB and Palette of any pixel on the screen.
 08-may-2010 - ugetab - Added savestate.object() which is savestate.create() with intuitive numbering under windows
 08-may-2010 - ugetab - Added emu.addgamegenie() and emu.delgamegenie() LUA functions.
diff --git a/src/state.cpp b/src/state.cpp
index 204541af..212d0f92 100644
--- a/src/state.cpp
+++ b/src/state.cpp
@@ -744,9 +744,6 @@ bool FCEUSS_Load(const char *fname)
 		}
 		else
 		{
-			//This looks redudant to me... but why bother deleting it:) //adelikat: TODO: remove this later
-			SaveStateStatus[CurrentState]=1;
-
 			FCEU_DispMessage("State %d loaded.",CurrentState);
 			SaveStateStatus[CurrentState]=1;
 		}
@@ -778,8 +775,8 @@ bool FCEUSS_Load(const char *fname)
 		
 		//Update input display if movie is loaded
 		extern uint32 cur_input_display;
-		if (FCEUMOV_Mode(MOVIEMODE_RECORD) ) //TODO: the memcpy line doesn't work if playback mode, figure out why and have it up date during that mode as well
-			memcpy(&cur_input_display,currMovieData.records[currMovieData.getNumRecords()-1].joysticks.data,4);
+		if (FCEUMOV_Mode(MOVIEMODE_RECORD) || FCEUMOV_Mode(MOVIEMODE_PLAY))
+			memcpy(&cur_input_display,currMovieData.records[currFrameCounter-1].joysticks.data,4);
 
 		return true;
 	}