diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index dd7570117b..6881db02b3 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -19,7 +19,7 @@ namespace BizHawk.Client.Common
 		{
 			ReadOnly = true;
 			MovieControllerAdapter = MovieService.DefaultInstance.LogGeneratorInstance().MovieControllerAdapter;
-			MultiTrack = new MultitrackRecording();
+			MultiTrack = new MultitrackRecorder();
 		}
 
 		/// <summary>
@@ -34,7 +34,7 @@ namespace BizHawk.Client.Common
 			get { return QueuedMovie != null; }
 		}
 
-		public MultitrackRecording MultiTrack { get; private set; }
+		public MultitrackRecorder MultiTrack { get; private set; }
 		public IMovieController MovieControllerAdapter{ get; set; }
 
 		public IMovie Movie { get; set; }
@@ -136,6 +136,10 @@ namespace BizHawk.Client.Common
 			{
 				var input = Movie.GetInputState(Global.Emulator.Frame);
 				MovieControllerAdapter.LatchFromSource(input);
+				if (MultiTrack.IsActive)
+				{
+					Global.MultitrackRewiringControllerAdapter.Source = MovieControllerAdapter;
+				}
 			}
 			else
 			{
diff --git a/BizHawk.Client.Common/movie/MultitrackRecording.cs b/BizHawk.Client.Common/movie/MultitrackRecording.cs
index 6ffdcecfb3..ee92d60772 100644
--- a/BizHawk.Client.Common/movie/MultitrackRecording.cs
+++ b/BizHawk.Client.Common/movie/MultitrackRecording.cs
@@ -1,24 +1,15 @@
 namespace BizHawk.Client.Common
 {
-	public class MultitrackRecording
+	public class MultitrackRecorder
 	{
-		public void Restart()
-		{
-			IsActive = false;
-			CurrentPlayer = 0;
-			RecordAll = false;
-		}
-
 		public bool IsActive { get; set; }
-
 		public int CurrentPlayer{ get; set; }
-
 		public bool RecordAll { get; set; }
 
 		/// <summary>
 		/// A user friendly multitrack status
 		/// </summary>
-		public string CurrentState
+		public string Status
 		{
 			get
 			{
@@ -41,6 +32,13 @@
 			}
 		}
 
+		public void Restart()
+		{
+			IsActive = false;
+			CurrentPlayer = 0;
+			RecordAll = false;
+		}
+
 		public void SelectAll()
 		{
 			CurrentPlayer = 0;
diff --git a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
index 2acb5d353e..300a657fd7 100644
--- a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
+++ b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
@@ -372,10 +372,10 @@ namespace BizHawk.Client.EmuHawk
 
 			if (Global.MovieSession.MultiTrack.IsActive)
 			{
-				float x = GetX(g, Global.Config.DispMultix, Global.Config.DispMultianchor, Global.MovieSession.MultiTrack.CurrentState);
-				float y = GetY(g, Global.Config.DispMultiy, Global.Config.DispMultianchor, Global.MovieSession.MultiTrack.CurrentState);
+				float x = GetX(g, Global.Config.DispMultix, Global.Config.DispMultianchor, Global.MovieSession.MultiTrack.Status);
+				float y = GetY(g, Global.Config.DispMultiy, Global.Config.DispMultianchor, Global.MovieSession.MultiTrack.Status);
 
-				DrawOsdMessage(g, Global.MovieSession.MultiTrack.CurrentState, FixedMessagesColor, x, y);
+				DrawOsdMessage(g, Global.MovieSession.MultiTrack.Status, FixedMessagesColor, x, y);
 			}
 
 			if (Global.Config.DisplayFPS && FPS != null)