diff --git a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs
index a0d6665979..c5ceb5fe2c 100644
--- a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs
+++ b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs
@@ -423,7 +423,7 @@ namespace BizHawk.MultiClient
 		public string MakeInputDisplay()
 		{
 			StringBuilder s;
-			if (Global.MovieSession.Movie.IsPlaying)
+			if (!Global.MovieSession.Movie.IsActive || Global.MovieSession.Movie.IsFinished)
 			{
 				s = new StringBuilder(Global.GetOutputControllersAsMnemonic());
 			}
diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs
index 38b2dcd342..74add5056d 100644
--- a/BizHawk.MultiClient/movie/InputAdapters.cs
+++ b/BizHawk.MultiClient/movie/InputAdapters.cs
@@ -168,10 +168,6 @@ namespace BizHawk.MultiClient
 		bool IsBasePressed(string name)
 		{
 			bool ret = Source.IsPressed(name);
-			if (ret)
-			{
-				//int zzz=9;
-			}
 			return ret;
 		}
 
@@ -188,6 +184,8 @@ namespace BizHawk.MultiClient
 					return "|..................................................|.|";
 				case "NES":
 					return "|.|........|........|........|........|";
+				case "SNES":
+					return "|.|............|............|............|............|";
 				case "SMS":
 				case "GG":
 				case "SG":
@@ -203,10 +201,35 @@ namespace BizHawk.MultiClient
 			}
 		}
 
+		//adelikat: I"m going to do all controllers like this, so what if it is redundant! It is better than reducing lines of code with convoluted logic that is difficult to expand to support new platforms
+		private string GetSNESControllersAsMnemonic()
+		{
+			StringBuilder input = new StringBuilder("|");
+			input.Append(IsBasePressed("Reset") ? Global.COMMANDS[ControlType]["Reset"] : ".");
+			input.Append("|");
+			for (int player = 1; player <= Global.PLAYERS[ControlType]; player++)
+			{
+				foreach (string button in Global.BUTTONS[ControlType].Keys)
+				{
+					input.Append(IsBasePressed("P" + button) ? Global.BUTTONS[ControlType][button] : ".");
+				}
+				input.Append("|");
+			}
+
+			return input.ToString();
+		}
+
+
 		public string GetControllersAsMnemonic()
 		{
 			if (Global.Emulator.SystemId == "NULL" || ControlType == "Null Controller")
+			{
 				return "|.|";
+			}
+			else if (Global.Emulator.SystemId == "SNES")
+			{
+				GetSNESControllersAsMnemonic();
+			}
 
 			StringBuilder input = new StringBuilder("|");