diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
index 85703a43d6..58bc97af1b 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
@@ -293,7 +293,9 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ToPCBtn_Click(object sender, EventArgs e)
 		{
+			UpdatePC();
 			UpdateDisassembler();
+			DisassemblerView.Refresh();
 		}
 
 		private void RefreshMenuItem_Click(object sender, EventArgs e)