diff --git a/CHANGELOG.md b/CHANGELOG.md
index d27b06f..08b690f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@ Fixes
 - Fixed dropdowns with some non-selectable children failing to navigate when using gamepad controls
 - Fixed UiMetrics.ForceAreaUpdateTime being inaccurate for nested elements
 - Fixed tooltips sometimes ignoring manually set IsHidden values
+- Fixed delayed tooltips sometimes displaying in the wrong location for one frame
 
 Removals
 - Marked StyleProp equality members as obsolete
diff --git a/MLEM.Ui/Elements/Tooltip.cs b/MLEM.Ui/Elements/Tooltip.cs
index 2095515..76237b0 100644
--- a/MLEM.Ui/Elements/Tooltip.cs
+++ b/MLEM.Ui/Elements/Tooltip.cs
@@ -79,6 +79,7 @@ namespace MLEM.Ui.Elements {
                 if (this.delayCountdown <= TimeSpan.Zero) {
                     this.IsHidden = false;
                     this.UpdateAutoHidden();
+                    this.SnapPositionToMouse();
                 }
             } else {
                 this.UpdateAutoHidden();