diff --git a/GUI.NET/Debugger/CodeTooltipManager.cs b/GUI.NET/Debugger/CodeTooltipManager.cs
index a1ee41eb..70066586 100644
--- a/GUI.NET/Debugger/CodeTooltipManager.cs
+++ b/GUI.NET/Debugger/CodeTooltipManager.cs
@@ -187,7 +187,7 @@ namespace Mesen.GUI.Debugger
 					}
 
 					if(ConfigManager.Config.DebugInfo.ShowOpCodeTooltips && frmOpCodeTooltip.IsOpCode(word)) {
-						ShowTooltip(word, null, -1, new AddressTypeInfo() { Address = address, Type = AddressType.Register });
+						ShowTooltip(word, null, address, new AddressTypeInfo() { Address = address, Type = AddressType.Register });
 						closeExistingPopup = false;
 					}
 				}