diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
index a2c16cc9f6..d6f2ea5221 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
@@ -54,11 +54,9 @@ namespace BizHawk.Client.EmuHawk
 		
 		private void Disassemble()
 		{
-			int lineCount = DisassemblerView.RowCount * 6 + 2;
-
 			_disassemblyLines.Clear();
 			uint currentAddress = _currentDisassemblerAddress;
-			for (int i = 0; i <= lineCount; ++i)
+			for (int i = 0; i <= DisassemblerView.RowCount; ++i)
 			{
 				if (currentAddress >= BusMaxValue)
 				{