diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs
index 6e518bb7e9..15e05954b7 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs
@@ -79,6 +79,9 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 			Pla = new Chip90611401();
 			Ram = new Chip4864();
 			Serial = new SerialPort();
+			
+			Cpu.DebuggerStep = Execute;
+			DiskDrive.DebuggerStep = Execute;
 
 			switch (sidType)
 			{