diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index f03c15491e..5a4834a3a4 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -260,7 +260,16 @@ namespace BizHawk.Client.EmuHawk
 							TasView.Refresh();
 
 							_startBoolDrawColumn = buttonName;
-							_boolPaintState = _currentTasMovie.BoolIsPressed(frame, buttonName);
+
+							if (frame < _currentTasMovie.InputLogLength)
+							{
+								_boolPaintState = _currentTasMovie.BoolIsPressed(frame, buttonName);
+							}
+							else
+							{
+								Global.ClickyVirtualPadController.IsPressed(buttonName);
+							}
+							
 						}
 						else
 						{