diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index 10804fd527..67ee4e7c62 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -795,7 +795,7 @@ namespace BizHawk.Client.Common
 
 				stateList.Remove(identifier);
 				if (stateList.Count == 0)
-					BranchStates[kvp.Key] = null;
+					BranchStates.Remove(kvp.Key);
 			}
 			//branches--;
 			//if (currentBranch <= _movie.BranchCount)
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index c74ab7a364..96532c6a92 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -128,9 +128,13 @@ namespace BizHawk.Client.EmuHawk
 
 		private void LoadSelectedBranch()
 		{
+			int index = BranchView.SelectedRows.First();
+			if (CurrentBranch == index)
+				return;
+
 			if (SelectedBranch != null)
 			{
-				CurrentBranch = BranchView.SelectedRows.First();
+				CurrentBranch = index;
 				BranchView.Refresh();
 				LoadBranch(SelectedBranch);
 			}
@@ -167,6 +171,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 
 				BranchView.Refresh();
+				Tastudio.RefreshDialog();
 			}
 		}
 
@@ -290,6 +295,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			Movie.UpdateBranch(branch, CreateBranch());
 			BranchView.Refresh();
+			Tastudio.RefreshDialog();
 		}
 
 		private void BranchView_MouseDown(object sender, MouseEventArgs e)