diff --git a/BizHawk.Client.Common/lua/NamedLuaFunction.cs b/BizHawk.Client.Common/lua/NamedLuaFunction.cs
index d6e678d24b..e57620d8b0 100644
--- a/BizHawk.Client.Common/lua/NamedLuaFunction.cs
+++ b/BizHawk.Client.Common/lua/NamedLuaFunction.cs
@@ -56,7 +56,9 @@ namespace BizHawk.Client.Common
 
 		public void Call(string name = null)
 		{
-			_function.Call(name);
+			LuaSandbox.Sandbox(() => {
+				_function.Call(name);
+			});
 		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/EnvironmentSandbox.cs b/BizHawk.Client.EmuHawk/tools/Lua/EnvironmentSandbox.cs
index 3445889c06..da807682b7 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/EnvironmentSandbox.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/EnvironmentSandbox.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace BizHawk.Client.EmuHawk.tools.Lua
+namespace BizHawk.Client.Common
 {
 	public class EnvironmentSandbox
 	{
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index aa355b3a16..f82189aaf1 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -14,7 +14,6 @@ using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Common.IEmulatorExtensions;
 using BizHawk.Client.EmuHawk.WinFormExtensions;
 using BizHawk.Client.EmuHawk.ToolExtensions;
-using BizHawk.Client.EmuHawk.tools.Lua;
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaSandbox.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaSandbox.cs
index a1e0255682..54bb31ab0b 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaSandbox.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaSandbox.cs
@@ -5,7 +5,7 @@ using System.Text;
 using LuaInterface;
 using System.Windows.Forms;
 
-namespace BizHawk.Client.EmuHawk.tools.Lua
+namespace BizHawk.Client.Common
 {
 	class LuaSandbox
 	{
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs
index 6cc9fca8de..d66979edac 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using BizHawk.Client.Common;
 using LuaInterface;
-using BizHawk.Client.EmuHawk.tools.Lua;
 
 namespace BizHawk.Client.EmuHawk
 {