diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 890c45f739..1ee269dbc8 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2687,6 +2687,8 @@ namespace BizHawk.Client.EmuHawk
 					runFrame = true;
 					_runloopFrameadvance = true;
 					_frameAdvanceTimestamp = currentTimestamp;
+					if (GlobalWin.Tools.IsLoaded<TAStudio>())
+						GlobalWin.Tools.TAStudio.IgnoreSeekFrame = false;
 				}
 				else
 				{
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index d6ca90cdb7..f1b732e2fe 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -937,6 +937,18 @@ namespace BizHawk.Client.EmuHawk
 			{
 				GoToNextMarker();
 			}
+			else if (e.KeyCode == Keys.Escape)
+			{
+				if (_floatEditRow != -1)
+				{
+					_floatEditRow = -1;
+				}
+				else
+				{
+					// not using StopSeeking() here, since it has special logic and should only happen when seek frame is reached
+					CancelSeekContextMenuItem_Click(null, null);
+				}
+			}
 
 			// SuuperW: Float Editing
 			if (_floatEditRow != -1)
@@ -1034,11 +1046,6 @@ namespace BizHawk.Client.EmuHawk
 					}
 				}
 			}
-			else
-			{
-				// not using StopSeeking() here, since it has special logic and should only happen when seek frame is reashed
-				CancelSeekContextMenuItem_Click(null, null);
-			}
 
 			RefreshDialog();
 		}