diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs
index 063f741ac3..f1f29a8195 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs
@@ -286,7 +286,7 @@
 			// Instruction
 			// 
 			this.Instruction.Text = "Instruction";
-			this.Instruction.Width = 143;
+			this.Instruction.Width = 291;
 			// 
 			// StepOutBtn
 			// 
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
index 8b42c526bc..887d9702ee 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 
@@ -54,5 +55,38 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 		}
+
+		private void DisassemblerView_QueryItemText(int index, int column, out string text)
+		{
+			text = "";
+			if (column == 0)
+			{
+				if (PC <= index && index < PC + DisassemblyLines.Count)
+				{
+					int a = PC;
+					for (int i = 0; i < index - PC; ++i)
+					{
+						a += DisassemblyLines[i].Size;
+					}
+
+					text = string.Format("{0:X4}", a);
+				}
+			}
+			else if (column == 1)
+			{
+				if (PC <= index && index < PC + DisassemblyLines.Count)
+				{
+					text = DisassemblyLines[index - PC].Mnemonic;
+				}
+			}
+		}
+
+		private void DisassemblerView_QueryItemBkColor(int index, int column, ref Color color)
+		{
+			if (index == PC)
+			{
+				color = Color.LightCyan;
+			}
+		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
index 280a92c6d0..c3377bf687 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
@@ -49,31 +49,6 @@ namespace BizHawk.Client.EmuHawk
 			EngageDebugger();
 		}
 
-		private void DisassemblerView_QueryItemText(int index, int column, out string text)
-		{
-			text = "";
-			if (column == 0)
-			{
-				if (PC <= index && index < PC + DisassemblyLines.Count)
-				{
-					int a = PC;
-					for (int i = 0; i < index - PC; ++i)
-						a += DisassemblyLines[i].Size;
-					text = string.Format("{0:X4}", a);
-				}
-			}
-			else if (column == 1)
-			{
-				if (PC <= index && index < PC + DisassemblyLines.Count)
-					text = DisassemblyLines[index - PC].Mnemonic;
-			}
-		}
-
-		private void DisassemblerView_QueryItemBkColor(int index, int column, ref Color color)
-		{
-			
-		}
-
 		public void DisableRegisterBox()
 		{
 			RegistersGroupBox.Enabled = false;