diff --git a/PKHeX.WinForms/Controls/Slots/SlotHoverHandler.cs b/PKHeX.WinForms/Controls/Slots/SlotHoverHandler.cs
index 26a904641..1ebc33d36 100644
--- a/PKHeX.WinForms/Controls/Slots/SlotHoverHandler.cs
+++ b/PKHeX.WinForms/Controls/Slots/SlotHoverHandler.cs
@@ -22,13 +22,15 @@ public sealed class SlotHoverHandler : IDisposable
         private readonly BitmapAnimator HoverWorker = new BitmapAnimator();
 
         private PictureBox Slot;
+        private SlotTrackerImage LastSlot;
 
-        public void Start(PictureBox pb, SlotTrackerImage LastSlot)
+        public void Start(PictureBox pb, SlotTrackerImage lastSlot)
         {
             var view = WinFormsUtil.FindFirstControlOfType<ISlotViewer<PictureBox>>(pb);
             var data = view.GetSlotData(pb);
             var pk = data.Read(view.SAV);
             Slot = pb;
+            LastSlot = lastSlot;
 
             var orig = LastSlot.OriginalBackground = pb.BackgroundImage;
 
@@ -62,8 +64,12 @@ public void Stop()
         {
             if (Slot != null)
             {
-                HoverWorker.Stop();
+                if (HoverWorker.Enabled)
+                    HoverWorker.Stop();
+                else
+                    Slot.BackgroundImage = LastSlot.OriginalBackground;
                 Slot = null;
+                LastSlot = null;
             }
             Preview.Clear();
             CryPlayer.Stop();