diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index ea105cdadb..43768f5ed5 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2500,8 +2500,11 @@ namespace BizHawk.Client.EmuHawk
 				Global.ClickyVirtualPadController.FrameTick();
 				Global.LuaAndAdaptor.FrameTick();
 
-				//zero 03-may-2014 - there is a bug in here: lua should be updating even when turboing
-				//please remove lua event-firing from gui viewing tools -related code
+				if (GlobalWin.Tools.Has<LuaConsole>())
+				{
+					GlobalWin.Tools.LuaConsole.LuaImp.CallFrameBeforeEvent();
+				}
+
 				if (!isTurboing)
 				{
 					GlobalWin.Tools.UpdateToolsBefore();
@@ -2565,6 +2568,12 @@ namespace BizHawk.Client.EmuHawk
 				}
 
 				PressFrameAdvance = false;
+
+				if (GlobalWin.Tools.Has<LuaConsole>())
+				{
+					GlobalWin.Tools.LuaConsole.LuaImp.CallFrameAfterEvent();
+				}
+
 				if (!isTurboing)
 				{
 					UpdateToolsAfter();
diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index dd4ed20846..c0afa86ab9 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -229,8 +229,6 @@ namespace BizHawk.Client.EmuHawk
 				{
 					LuaConsole.StartLuaDrawing();
 				}
-
-				LuaConsole.LuaImp.CallFrameBeforeEvent();
 			}
 
 			UpdateBefore();
@@ -247,7 +245,6 @@ namespace BizHawk.Client.EmuHawk
 
 			if (Has<LuaConsole>())
 			{
-				LuaConsole.LuaImp.CallFrameAfterEvent();
 				if (!fromLua)
 				{
 					LuaConsole.EndLuaDrawing();