diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
index af4dab0f98..b54f8281d9 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
@@ -20,6 +20,13 @@ namespace BizHawk.Client.EmuHawk
 
 		private IMemoryCallbackSystem MemoryCallbacks { get { return Debuggable.MemoryCallbacks; } }
 
+
+		private RegisterValue PCRegister
+		{
+			get { return Debuggable.GetCpuFlagsAndRegisters()[Disassembler.PCRegisterName]; }
+		}
+
+		// TODO: get rid of me
 		private uint PC
 		{
 			// TODO: is this okay for N64?
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
index 910a21f074..c48b25deb4 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
@@ -114,7 +114,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (RegisterPanel.CanGetCpuRegisters)
 			{
-				var pc = Debuggable.GetCpuFlagsAndRegisters()["PC"];
+				var pc = PCRegister;
 				SeekToBox.Nullable = false;
 				SeekToBox.SetHexProperties((long)Math.Pow(2, pc.BitSize));
 				SeekToBox.SetFromRawInt(0);