diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index 4145ea63cf..2f42512292 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -133,10 +133,29 @@ namespace BizHawk.Client.Common
 		/// </summary>
 		public string DisplayValue(int frame, string buttonName)
 		{
+			if (UseInputCache && InputStateCache.ContainsKey(frame))
+			{
+				return CreateDisplayValueForButton(InputStateCache[frame], buttonName);
+			}
+
 			var adapter = GetInputState(frame);
+
+			if (UseInputCache)
+			{
+				InputStateCache.Add(frame, adapter);
+			}
+
 			return CreateDisplayValueForButton(adapter, buttonName);
 		}
 
+		private readonly Dictionary<int, IController> InputStateCache = new Dictionary<int, IController>();
+
+		public bool UseInputCache { get; set; }
+		public void FlushInputCache()
+		{
+			InputStateCache.Clear();
+		}
+
 		public string CreateDisplayValueForButton(IController adapter, string buttonName)
 		{
 			if (adapter.Type.BoolButtons.Contains(buttonName))
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 0c2f2e2050..47b82fcb0d 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -153,9 +153,15 @@ namespace BizHawk.Client.EmuHawk
 
 		public void RefreshDialog()
 		{
+			_currentTasMovie.FlushInputCache();
+			_currentTasMovie.UseInputCache = true;
+
 			TasView.ItemCount = _currentTasMovie.InputLogLength + 1;
 			TasView.Refresh();
 
+			_currentTasMovie.FlushInputCache();
+			_currentTasMovie.UseInputCache = false;
+
 			if (MarkerControl != null)
 			{
 				MarkerControl.UpdateValues();