diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 070cf4b3a0..a8118205c0 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -833,15 +833,20 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
+					if (!string.IsNullOrWhiteSpace(_startBoolDrawColumn))
+					{
+						// If painting up, we have altered frames without loading states (for smoothness)
+						// So now we have to ensure that all the edited frames are invalidated
+						if (CurrentTasMovie.LastEditedFrame < Emulator.Frame)
+						{
+							GoToFrame(CurrentTasMovie.LastEditedFrame);
+						}
+					}
+
 					ClearLeftMouseStates();
 				}
 
-				// If painting up, we have altered frames without loading states (for smoothness)
-				// So now we have to ensure that all the edited frames are invalidated
-				if (CurrentTasMovie.LastEditedFrame < Emulator.Frame)
-				{
-					GoToFrame(CurrentTasMovie.LastEditedFrame);
-				}
+				
 
 				DoTriggeredAutoRestoreIfNeeded();
 			}