diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs
index aaf49dae40..311a42e638 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs
@@ -19,8 +19,6 @@ namespace BizHawk.Client.EmuHawk
 			RowIndex = cell.RowIndex;
 		}
 
-		public bool IsDataCell => Column != null && RowIndex.HasValue;
-
 		public override bool Equals(object obj)
 		{
 			var cell = obj as Cell;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index 23754e472a..83c2d4d943 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -572,7 +572,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (e.Button == MouseButtons.Left)
 			{
-				if (BranchView.CurrentCell != null && BranchView.CurrentCell.IsDataCell
+				if (BranchView.CurrentCell.IsDataCell()
 					&& BranchView.CurrentCell.Column.Name == BranchNumberColumnName)
 				{
 					BranchView.DragCurrentCell();
@@ -615,7 +615,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void BranchView_CellDropped(object sender, InputRoll.CellEventArgs e)
 		{
-			if (e.NewCell != null && e.NewCell.IsDataCell && e.OldCell.RowIndex < Movie.Branches.Count)
+			if (e.NewCell.IsDataCell() && e.OldCell.RowIndex < Movie.Branches.Count)
 			{
 				var guid = Movie.BranchGuidByIndex(Movie.CurrentBranch);
 				Movie.SwapBranches(e.OldCell.RowIndex.Value, e.NewCell.RowIndex.Value);