diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
index 2d2834d818..50508b5f7a 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
@@ -150,7 +150,10 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SetDisassemblerItemCount()
 		{
-			DisassemblerView.RowCount = DisassemblerView.VisibleRows * 6 + 2;
+			if (DisassemblerView.VisibleRows > 0)
+			{
+				DisassemblerView.RowCount = DisassemblerView.VisibleRows * 6 + 2;
+			}		
 		}
 
 		private void DisassemblerView_SizeChanged(object sender, EventArgs e)