diff --git a/PKHeX.WinForms/Subforms/SAV_Database.cs b/PKHeX.WinForms/Subforms/SAV_Database.cs
index 3dde6e7e2..c959e6cb9 100644
--- a/PKHeX.WinForms/Subforms/SAV_Database.cs
+++ b/PKHeX.WinForms/Subforms/SAV_Database.cs
@@ -44,33 +44,35 @@ public SAV_Database(PKMEditor f1, SAVEditor saveditor)
             };
 
             // Enable Scrolling when hovered over
-            PAN_Box.MouseHover += (sender, args) =>
+            PAN_Box.MouseWheel += (sender, e) =>
             {
                 if (ActiveForm == this)
                     SCR_Box.Focus();
             };
             foreach (var slot in PKXBOXES)
             {
-                slot.MouseEnter += (sender, args) =>
+                slot.MouseWheel += (sender, e) =>
                 {
                     if (ActiveForm == this)
                         SCR_Box.Focus();
                 };
                 // Enable Click
-                slot.MouseClick += (sender, args) =>
+                slot.MouseClick += (sender, e) =>
                 {
                     if (ModifierKeys == Keys.Control)
-                        ClickView(sender, args);
+                        ClickView(sender, e);
                     else if (ModifierKeys == Keys.Alt)
-                        ClickDelete(sender, args);
+                        ClickDelete(sender, e);
                     else if (ModifierKeys == Keys.Shift)
-                        ClickSet(sender, args);
+                        ClickSet(sender, e);
                 };
             }
             
             Counter = L_Count.Text;
             Viewed = L_Viewed.Text;
             L_Viewed.Text = ""; // invis for now
+            var hover = new ToolTip();
+            L_Viewed.MouseEnter += (sender, e) => hover.SetToolTip(L_Viewed, L_Viewed.Text);
             PopulateComboBoxes();
 
             ContextMenuStrip mnu = new ContextMenuStrip();
diff --git a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
index 955c3f4aa..58ffffc92 100644
--- a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
+++ b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
@@ -40,29 +40,31 @@ public SAV_MysteryGiftDB(PKMEditor tabs, SAVEditor sav)
             };
 
             // Enable Scrolling when hovered over
-            PAN_Box.MouseHover += (sender, args) =>
+            PAN_Box.MouseWheel += (sender, e) =>
             {
                 if (ActiveForm == this)
                     SCR_Box.Focus();
             };
             foreach (var slot in PKXBOXES)
             {
-                slot.MouseEnter += (sender, args) =>
+                slot.MouseWheel += (sender, e) =>
                 {
                     if (ActiveForm == this)
                         SCR_Box.Focus();
                 };
                 // Enable Click
-                slot.MouseClick += (sender, args) =>
+                slot.MouseClick += (sender, e) =>
                 {
                     if (ModifierKeys == Keys.Control)
-                        ClickView(sender, args);
+                        ClickView(sender, e);
                 };
             }
             
             Counter = L_Count.Text;
             Viewed = L_Viewed.Text;
             L_Viewed.Text = ""; // invis for now
+            var hover = new ToolTip();
+            L_Viewed.MouseEnter += (sender, e) => hover.SetToolTip(L_Viewed, L_Viewed.Text);
 
             ContextMenuStrip mnu = new ContextMenuStrip();
             ToolStripMenuItem mnuView = new ToolStripMenuItem("View");