diff --git a/GUI.NET/Debugger/CodeTooltipManager.cs b/GUI.NET/Debugger/CodeTooltipManager.cs
index 15db3d7e..770f47fe 100644
--- a/GUI.NET/Debugger/CodeTooltipManager.cs
+++ b/GUI.NET/Debugger/CodeTooltipManager.cs
@@ -46,10 +46,7 @@ namespace Mesen.GUI.Debugger
 			Form parentForm = _owner.FindForm();
 
 			if(_hoverLastWord != word || _hoverLastLineAddress != lineAddress || _codeTooltip == null) {
-				if(_codeTooltip != null) {
-					_codeTooltip.Close();
-					_codeTooltip = null;
-				}
+				this.Close();
 
 				if(ConfigManager.Config.DebugInfo.ShowOpCodeTooltips && frmOpCodeTooltip.IsOpCode(word)) {
 					_codeTooltip = new frmOpCodeTooltip(parentForm, word, lineAddress);