diff --git a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
index 278f1f5167..cae29826f0 100644
--- a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
+++ b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
@@ -223,9 +223,10 @@ namespace BizHawk.Client.EmuHawk
 
 		public string InputStrMovie()
 		{
-			var sb = new StringBuilder(Global.MovieSession.Movie.GetInput(Global.Emulator.Frame));
-			sb.Replace(".", " ").Replace("|", "").Replace(" 000, 000", "         ");
-			return sb.ToString();
+			var lg = Global.MovieSession.Movie.LogGeneratorInstance();
+			lg.SetSource(Global.MovieSession.MovieControllerAdapter);
+
+			return lg.GenerateInputDisplay();
 		}
 
 		public string InputStrImmediate()
@@ -240,9 +241,9 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (Global.MovieSession.Movie.IsActive)
 			{
-				var sb = new StringBuilder(Global.MovieSession.Movie.GetInput(Global.Emulator.Frame - 1));
-				sb.Replace(".", " ").Replace("|", "").Replace(" 000, 000", "         ");
-				return sb.ToString();
+				var lg = Global.MovieSession.Movie.LogGeneratorInstance();
+				lg.SetSource(Global.MovieSession.Movie.GetInputState(Global.Emulator.Frame - 1));
+				return lg.GenerateInputDisplay();
 			}
 
 			return string.Empty;
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/AnalogControlPanel.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/AnalogControlPanel.cs
index 3cdfcacb98..72e95d0c55 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/AnalogControlPanel.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/AnalogControlPanel.cs
@@ -88,13 +88,10 @@ namespace BizHawk.Client.EmuHawk
 
 				if (Global.MovieSession.Movie.IsPlaying && !Global.MovieSession.Movie.IsFinished)
 				{
-					var logEntry = Global.MovieSession.Movie.GetInput(Global.Emulator.Frame - 1);
-					var lg = Global.MovieSession.Movie.LogGeneratorInstance().MovieControllerAdapter;
-					lg.Type = Global.MovieSession.MovieControllerAdapter.Type;
-					lg.SetControllersAsMnemonic(logEntry);
+					var input = Global.MovieSession.Movie.GetInputState(Global.Emulator.Frame - 1);
 
-					var x = lg.GetFloat(Controller + " X Axis");
-					var y = lg.GetFloat(Controller + " Y Axis");
+					var x = input.GetFloat(Controller + " X Axis");
+					var y = input.GetFloat(Controller + " Y Axis");
 
 					var xx = RealToGFX((int)x);
 					var yy = RealToGFX((int)y);