diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 9f25fdcc5b..0252380420 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -137,6 +137,7 @@
     <Compile Include="lua\EmuLuaLibrary.SNES.cs" />
     <Compile Include="lua\EmuLuaLibrary.String.cs" />
     <Compile Include="lua\EmuLuaLibrary.UserData.cs" />
+    <Compile Include="lua\EnvironmentSandbox.cs" />
     <Compile Include="lua\LuaAttributes.cs" />
     <Compile Include="lua\LuaDocumentation.cs" />
     <Compile Include="lua\LuaFile.cs" />
@@ -145,6 +146,7 @@
     <Compile Include="lua\LuaHelper.cs" />
     <Compile Include="lua\LuaLibraryBase.cs" />
     <Compile Include="lua\LuaMemoryBase.cs" />
+    <Compile Include="lua\LuaSandbox.cs" />
     <Compile Include="lua\NamedLuaFunction.cs" />
     <Compile Include="movie\bk2\Bk2ControllerAdapter.cs" />
     <Compile Include="movie\bk2\Bk2Header.cs" />
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/EnvironmentSandbox.cs b/BizHawk.Client.Common/lua/EnvironmentSandbox.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/Lua/EnvironmentSandbox.cs
rename to BizHawk.Client.Common/lua/EnvironmentSandbox.cs
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaSandbox.cs b/BizHawk.Client.Common/lua/LuaSandbox.cs
similarity index 92%
rename from BizHawk.Client.EmuHawk/tools/Lua/LuaSandbox.cs
rename to BizHawk.Client.Common/lua/LuaSandbox.cs
index 54bb31ab0b..01d3b4a3b5 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaSandbox.cs
+++ b/BizHawk.Client.Common/lua/LuaSandbox.cs
@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
+using System.Text;
 using LuaInterface;
-using System.Windows.Forms;
 
 namespace BizHawk.Client.Common
 {
-	class LuaSandbox
+	public class LuaSandbox
 	{
 		protected static Action<string> Logger;
 
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index a99f24dbb9..a25e3b6c9c 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -822,7 +822,6 @@
     <Compile Include="tools\HexEditor\NewHexEditor.Designer.cs">
       <DependentUpon>NewHexEditor.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\Lua\EnvironmentSandbox.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Client.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Console.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.cs" />
@@ -864,7 +863,6 @@
     <Compile Include="tools\Lua\LuaRegisteredFunctionsList.Designer.cs">
       <DependentUpon>LuaRegisteredFunctionsList.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\Lua\LuaSandbox.cs" />
     <Compile Include="tools\Lua\LuaTextBox.cs">
       <SubType>Component</SubType>
     </Compile>