diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
index 42bcdca05f..3326e5a7f5 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
@@ -1076,13 +1076,23 @@ namespace BizHawk.Client.EmuHawk
 
 		protected override void OnMouseLeave(EventArgs e)
 		{
+			bool refresh = false;
 			_currentX = null;
 			_currentY = null;
+			if (IsHoveringOnColumnCell)
+			{
+				refresh = true;
+			}
+
 			CurrentCell = null;
 			IsPaintDown = false;
 			_columnResizing = null;
 			_hoverTimer.Stop();
-			Refresh();
+			if (refresh)
+			{
+				Refresh();
+			}
+
 			base.OnMouseLeave(e);
 		}