diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 9bd053eb01..0c044bef1e 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -198,8 +198,10 @@ namespace BizHawk.Client.EmuHawk
 
 				if (columnName == CursorColumnName)
 				{
-					// TODO: what logic should we have when there is more than 1?
-					var branch = CurrentTasMovie.TasBranches.FirstOrDefault(x => x.Frame == index);
+					var branch = CurrentTasMovie.TasBranches
+						.Where(b => b.Frame == index)
+						.OrderByDescending(b => b.TimeStamp)
+						.FirstOrDefault();
 					if (branch != null)
 					{
 						text = CurrentTasMovie.TasBranches.IndexOf(branch).ToString();