diff --git a/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs b/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
index 54b9713632..1a9beb4a92 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
@@ -44,7 +44,7 @@ namespace BizHawk.Client.EmuHawk
 				return (uint)_maxSize.Value;
 			}
 
-            return (uint)(((long)1 << (4 * MaxLength)) - 1);
+			return (uint)(((long)1 << (4 * MaxLength)) - 1);
 		}
 
 		public override void ResetText()
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.cs b/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.cs
index d0fd5d71cb..5853253db7 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.cs
@@ -55,7 +55,7 @@ namespace BizHawk.Client.EmuHawk
 
 			set
 			{
-				AddressBox.MaxLength = value;
+				AddressBox.SetHexProperties(value);
 			}
 		}
 
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
index d96aa95e25..d31770871a 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Common.NumberExtensions;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Common.IEmulatorExtensions;
 using BizHawk.Client.Common;
@@ -101,7 +100,7 @@ namespace BizHawk.Client.EmuHawk.tools.Debugger
 			var b = new AddBreakpointDialog
 			{
 				// TODO: don't use Global.Emulator! Pass in an IMemoryDomains implementation from the parent tool
-				MaxAddressSize = (Global.Emulator.AsMemoryDomains().MemoryDomains.SystemBus.Size - 1).NumHexDigits()
+				MaxAddressSize = Global.Emulator.AsMemoryDomains().MemoryDomains.SystemBus.Size - 1
 			};
 
 			if (b.ShowDialog() == DialogResult.OK)