diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
index bbf7efba0e..9bb09fe9f2 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
@@ -38,10 +38,10 @@ namespace BizHawk.Client.EmuHawk
 			if (CanDisassemble)
 			{
 				DisassemblerView.BlazingFast = true;
-				DisassemblerView.ItemCount = 0;
+				
 				currentDisassemblerAddress = (uint)PCRegister.Value;
 				Disassemble();
-				DisassemblerView.Refresh();
+				SetDisassemblerItemCount();
 				DisassemblerView.BlazingFast = false;
 			}
 		}