diff --git a/BizHawk.Client.Common/lua/LuaFile.cs b/BizHawk.Client.Common/lua/LuaFile.cs
index c03c2968c5..dfcfe73e0d 100644
--- a/BizHawk.Client.Common/lua/LuaFile.cs
+++ b/BizHawk.Client.Common/lua/LuaFile.cs
@@ -61,10 +61,18 @@ namespace BizHawk.Client.Common
 		public void Toggle()
 		{
 			if (State == RunState.Paused)
+			{
 				State = RunState.Running;
+			}
 			else if (State == RunState.Disabled)
+			{
 				State = RunState.Running;
-			else State = RunState.Disabled;
+				FrameWaiting = false;
+			}
+			else
+			{
+				State = RunState.Disabled;
+			}
 		}
 
 		public void TogglePause()