diff --git a/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp b/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp
index 513638f819..08e3b7fa33 100644
--- a/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp
+++ b/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp
@@ -211,9 +211,6 @@ void TooltipWindow::timerCallback()
     {
         const auto newTip = newComp != nullptr ? getTipFor (*newComp) : String();
 
-        lastComponentUnderMouse = newComp;
-        lastTipUnderMouse = newTip;
-
         const auto mousePos = mouseSource.getScreenPosition();
         const auto mouseMovedQuickly = (mousePos.getDistanceFrom (lastMousePos) > 12);
         lastMousePos = mousePos;
@@ -249,6 +246,9 @@ void TooltipWindow::timerCallback()
                 showTip();
             }
         }
+
+        lastComponentUnderMouse = newComp;
+        lastTipUnderMouse = newTip;
     }
 }