diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 7fe625350b..5b5b99cac8 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -787,9 +787,15 @@ namespace BizHawk.Client.EmuHawk
 			// This is only caled from Lua.
 			_editIsFromLua = true;
 			BeginBatchEdit();
-			action();
-			EndBatchEdit();
-			_editIsFromLua = false;
+			try
+			{
+				action();
+			}
+			finally
+			{
+				EndBatchEdit();
+				_editIsFromLua = false;
+			}
 		}
 
 		/// <summary>