diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index ef38490239..c25a55943b 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -487,8 +487,10 @@ namespace BizHawk.Client.EmuHawk
 			_floatEditYPos = -1;
 			_leftButtonHeld = false;
 
-			if (_floatEditRow == -1)
+			if (_floatEditRow == -1 && CurrentTasMovie.ChangeLog != null)
+			{
 				CurrentTasMovie.ChangeLog.EndBatch();
+			}
 		}
 
 		private void TasView_MouseUp(object sender, MouseEventArgs e)