diff --git a/src/debugger.c b/src/debugger.c
index 324e7d4d..bb92ef99 100644
--- a/src/debugger.c
+++ b/src/debugger.c
@@ -227,6 +227,7 @@ void DEBUGSetBreakPoint(int newBreakPoint) {
 void DEBUGBreakToDebugger(void) {
 	currentMode = DMODE_STOP;
 	currentPC = pc;
+   currentPCBank = pc < 0xC000 ? memory_get_ram_bank() : memory_get_rom_bank();
 }
 
 // *******************************************************************************************