diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 1f25b0d3bf..465f346a80 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -289,7 +289,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			GlobalWin.Sound.StartSound();
 			InputManager.RewireInputChain();
-			GlobalWin.Tools = new ToolManager();
+			GlobalWin.Tools = new ToolManager(this);
 			RewireSound();
 
 			// Workaround for windows, location is -32000 when minimized, if they close it during this time, that's what gets saved
diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index 4882d28b83..e25645e2d4 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -28,8 +28,8 @@ namespace BizHawk.Client.EmuHawk
 		private void ToolBox_Load(object sender, EventArgs e)
 		{
 			Location = new Point(
-				GlobalWin.MainForm.Location.X + GlobalWin.MainForm.Size.Width,
-				GlobalWin.MainForm.Location.Y
+				Owner.Location.X + Owner.Size.Width,
+				Owner.Location.Y
 			);
 		}
 
diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 1b1d0ba5fc..42e6717319 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -16,6 +16,13 @@ namespace BizHawk.Client.EmuHawk
 {
 	public class ToolManager
 	{
+		public ToolManager(Form owner)
+		{
+			_owner = owner;
+		}
+
+		private readonly Form _owner;
+
 		// TODO: merge ToolHelper code where logical
 		// For instance, add an IToolForm property called UsesCheats, so that a UpdateCheatRelatedTools() method can update all tools of this type
 		// Also a UsesRam, and similar method
@@ -62,6 +69,11 @@ namespace BizHawk.Client.EmuHawk
 
 			var newTool = CreateInstance(toolType);
 
+			if (newTool is Form)
+			{
+				(newTool as Form).Owner = GlobalWin.MainForm;
+			}
+
 			ServiceInjector.UpdateServices(Global.Emulator.ServiceProvider, newTool);
 
 			// auto settings