diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 87f6c5e3e3..bcb0d475bc 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk
 		private bool _boolPaintState;
 		private float _floatPaintState;
 		private bool _patternPaint = false;
-		private bool _startMarkerDrag;
+		private bool _startCursorDrag;
 		private bool _startFrameDrag;
 		private bool _frameDragState;
 		private bool _supressContextMenu;
@@ -82,7 +82,7 @@ namespace BizHawk.Client.EmuHawk
 
 			var columnName = column.Name;
 
-			if (columnName == MarkerColumnName)
+			if (columnName == CursorColumnName)
 			{
 				if (index == Emulator.Frame && index == GlobalWin.MainForm.PauseOnFrame)
 				{
@@ -117,7 +117,7 @@ namespace BizHawk.Client.EmuHawk
 
 			string columnName = column.Name;
 
-			if (columnName == MarkerColumnName)
+			if (columnName == CursorColumnName)
 			{ // For debugging purposes, let's visually show the state frames
 				if (VersionInfo.DeveloperBuild && CurrentTasMovie.TasStateManager.HasState(index))
 					color = Color.FromArgb(0xEEEEEE);
@@ -176,7 +176,7 @@ namespace BizHawk.Client.EmuHawk
 				text = string.Empty;
 				var columnName = column.Name;
 
-				if (columnName == MarkerColumnName)
+				if (columnName == CursorColumnName)
 				{
 					// Do nothing
 				}
@@ -220,7 +220,7 @@ namespace BizHawk.Client.EmuHawk
 					RefreshDialog();
 
 				}
-				else if (columnName != MarkerColumnName) // TODO: what about float?
+				else if (columnName != CursorColumnName) // TODO: what about float?
 				{
 					foreach (var index in TasView.SelectedRows)
 					{
@@ -330,9 +330,9 @@ namespace BizHawk.Client.EmuHawk
 					}
 				}
 
-				if (TasView.CurrentCell.Column.Name == MarkerColumnName)
+				if (TasView.CurrentCell.Column.Name == CursorColumnName)
 				{
-					_startMarkerDrag = true;
+					_startCursorDrag = true;
 					GoToFrame(TasView.CurrentCell.RowIndex.Value);
 				}
 				else if (TasView.CurrentCell.Column.Name == FrameColumnName)
@@ -449,7 +449,7 @@ namespace BizHawk.Client.EmuHawk
 			else if (e.Button == MouseButtons.Left)
 			{
 				CurrentTasMovie.SupressGreenzonging = false;
-				_startMarkerDrag = false;
+				_startCursorDrag = false;
 				_startFrameDrag = false;
 				_startBoolDrawColumn = string.Empty;
 				_startFloatDrawColumn = string.Empty;
@@ -550,7 +550,7 @@ namespace BizHawk.Client.EmuHawk
 				endVal = e.OldCell.RowIndex.Value;
 			}
 
-			if (_startMarkerDrag)
+			if (_startCursorDrag)
 			{
 				if (e.NewCell.RowIndex.HasValue)
 				{
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs
index d6ec5da7d6..bf8c2e0bfa 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs
@@ -54,7 +54,10 @@ namespace BizHawk.Client.EmuHawk
 						}
 
 						GlobalWin.DisplayManager.NeedsToPaint = true;
-						SetVisibleIndex(frame);
+                        if (TasPlaybackBox.FollowCursor)
+                        {
+                            SetVisibleIndex(frame);
+                        }
 					}
 					else // Get as close as we can then emulate there
 					{
@@ -81,7 +84,10 @@ namespace BizHawk.Client.EmuHawk
 							Emulator.FrameAdvance(true);
 							GlobalWin.DisplayManager.NeedsToPaint = true;
 
-							SetVisibleIndex(frame);
+                            if (TasPlaybackBox.FollowCursor)
+                            {
+                                SetVisibleIndex(frame);
+                            }
 						}
 						else
 						{
@@ -165,7 +171,7 @@ namespace BizHawk.Client.EmuHawk
 			GoToFrame(marker.Frame);
 		}
 
-		public void SetVisibleIndex(int? indexThatMustBeVisible = null)
+        public void SetVisibleIndex(int? indexThatMustBeVisible = null)
 		{
 			if (!indexThatMustBeVisible.HasValue)
 			{
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 97f3cf8dd8..2a2270c85e 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -19,7 +19,7 @@ namespace BizHawk.Client.EmuHawk
 	public partial class TAStudio : Form, IToolFormAutoConfig, IControlMainform
 	{
 		// TODO: UI flow that conveniently allows to start from savestate
-		private const string MarkerColumnName = "MarkerColumn";
+        private const string CursorColumnName = "CursorColumn";
 		private const string FrameColumnName = "FrameColumn";
 
 		private readonly List<TasClipboardEntry> _tasClipboard = new List<TasClipboardEntry>();
@@ -224,7 +224,7 @@ namespace BizHawk.Client.EmuHawk
 		private void SetUpColumns()
 		{
 			TasView.AllColumns.Clear();
-			AddColumn(MarkerColumnName, string.Empty, 18);
+			AddColumn(CursorColumnName, string.Empty, 18);
 			AddColumn(FrameColumnName, "Frame#", 68);
 
 			var columnNames = GenerateColumnNames();