diff --git a/src/widgets/AButton.cpp b/src/widgets/AButton.cpp
index a5110932d..7bcc06b14 100644
--- a/src/widgets/AButton.cpp
+++ b/src/widgets/AButton.cpp
@@ -383,8 +383,12 @@ void AButton::OnMouseEvent(wxMouseEvent & event)
    wxSize clientSize = GetClientSize();
    AButtonState prevState = GetState();
 
-   if (event.Entering())
+   if (event.Entering()) {
+      auto text = GetToolTipText();
+      UnsetToolTip();
+      SetToolTip(text);
       mCursorIsInWindow = true;
+   }
    else if (event.Leaving())
       mCursorIsInWindow = false;
    else