diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
index d9a07b2904..31271639f2 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
@@ -332,8 +332,7 @@ namespace BizHawk.Client.EmuHawk.tools.Debugger
 
 			var b = new AddBreakpointDialog(operation)
 			{
-				// TODO: don't use Global.Emulator! Pass in an IMemoryDomains implementation from the parent tool
-				MaxAddressSize = Global.Emulator.AsMemoryDomains().SystemBus.Size - 1
+				MaxAddressSize = MemoryDomains.SystemBus.Size - 1
 			};
 
 			if (type != null)