diff --git a/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs b/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs
index 98ff514ec0..1be5406de8 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs
@@ -146,8 +146,6 @@ namespace BizHawk.Client.Common
 		{
 			_lagLog.Clear();
 			_wasLag.Clear();
-			////if (br.BaseStream.Length > 0)
-			////{ BaseStream.Length does not return the expected value.
 			int formatVersion = br.ReadByte();
 			if (formatVersion == 0)
 			{
@@ -175,7 +173,6 @@ namespace BizHawk.Client.Common
 					_wasLag.Add(br.ReadBoolean());
 				}
 			}
-			////}
 		}
 
 		public bool? History(int frame)
@@ -193,19 +190,6 @@ namespace BizHawk.Client.Common
 			return null;
 		}
 
-		public int LastValidFrame
-		{
-			get
-			{
-				if (_lagLog.Count == 0)
-				{
-					return 0;
-				}
-
-				return _lagLog.Count - 1;
-			}
-		}
-
 		public TasLagLog Clone()
 		{
 			return new TasLagLog
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index 0a5aee0af2..3814fcdb11 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -35,7 +35,7 @@ namespace BizHawk.Client.Common
 		public TasLagLog TasLagLog => _lagLog;
 		public IStringLog InputLog => Log;
 		public int BranchCount => Branches.Count;
-		public int LastValidFrame => _lagLog.LastValidFrame;
+		public int LastStatedFrame => _stateManager.LastStatedFrame;
 		public override string PreferredExtension => Extension;
 		public TasStateManager TasStateManager => _stateManager;
 
@@ -225,7 +225,9 @@ namespace BizHawk.Client.Common
 
 		public void GreenzoneCurrentFrame()
 		{
-			if (Global.Emulator.Frame > LastValidFrame)
+			// todo: this isn't working quite right when autorestore is off and we're editing while seeking
+			// but accounting for that requires access to Mainform.IsSeeking
+			if (Global.Emulator.Frame > LastEditedFrame)
 			{
 				// emulated a new frame, current editing segment may change now. taseditor logic
 				LastPositionStable = false;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 86604fe764..c9cb910243 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -66,9 +66,9 @@ namespace BizHawk.Client.EmuHawk
 
 		public void JumpToGreenzone()
 		{
-			if (Emulator.Frame > CurrentTasMovie.LastValidFrame)
+			if (Emulator.Frame > CurrentTasMovie.LastEditedFrame)
 			{
-				GoToLastEmulatedFrameIfNecessary(CurrentTasMovie.LastValidFrame);
+				GoToLastEmulatedFrameIfNecessary(CurrentTasMovie.LastEditedFrame);
 			}
 			else
 			{
@@ -1132,7 +1132,7 @@ namespace BizHawk.Client.EmuHawk
 
 					if (!Settings.AutoRestoreOnMouseUpOnly)
 					{
-						_triggerAutoRestore = true;
+						_triggerAutoRestore = startVal < Emulator.Frame && endVal < Emulator.Frame;
 						DoTriggeredAutoRestoreIfNeeded();
 					}
 				}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index 672ec1656f..3695e8d996 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -807,7 +807,7 @@ namespace BizHawk.Client.EmuHawk
 
 			GoToFrame(0);
 			int lastState = 0;
-			int goToFrame = CurrentTasMovie.TasStateManager.LastStatedFrame;
+			int goToFrame = CurrentTasMovie.LastStatedFrame;
 			do
 			{
 				Mainform.FrameAdvance();