diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
index d6f2ea5221..b8c881fa54 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
@@ -48,7 +48,6 @@ namespace BizHawk.Client.EmuHawk
 			if (CanDisassemble)
 			{
 				Disassemble();
-				SetDisassemblerItemCount();
 			}
 		}
 		
@@ -143,10 +142,7 @@ namespace BizHawk.Client.EmuHawk
 		private void DisassemblerView_SizeChanged(object sender, EventArgs e)
 		{
 			SetDisassemblerItemCount();
-			if (CanDisassemble)
-			{
-				Disassemble();
-			}
+			UpdateDisassembler();
 		}
 
 		private void SmallIncrement()
diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
index b7b1d3296d..6b4624f6a3 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
@@ -109,7 +109,6 @@ namespace BizHawk.Client.EmuHawk
 			UpdateCapabilitiesProps();
 			DisengageDebugger();
 			EngageDebugger();
-			FullUpdate();
 		}
 
 		protected override void GeneralUpdate() => FullUpdate();