diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
index cefc2830e9..df9b7328aa 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
@@ -5,6 +5,8 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
+using BizHawk.Common.NumberExtensions;
+
 namespace BizHawk.Client.EmuHawk
 {
 	public partial class GenericDebugger
@@ -75,7 +77,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (column == 0)
 				{
-					text = string.Format($"{{0:X{_pcRegisterSize}}}", _disassemblyLines[index].Address);
+					text = _disassemblyLines[index].Address.ToHexString(_pcRegisterSize);
 				}
 				else if (column == 1)
 				{
@@ -235,7 +237,7 @@ namespace BizHawk.Client.EmuHawk
 						blob.AppendLine();
 					}
 
-					blob.Append(string.Format($"{{0:X{_pcRegisterSize}}}", _disassemblyLines[index].Address))
+					blob.Append(_disassemblyLines[index].Address.ToHexString(_pcRegisterSize))
 						.Append(" ")
 						.Append(_disassemblyLines[index].Mnemonic);
 				}