diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 26d6b22c30..21d64b795a 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Graphics.Cursor
                 ActiveCursor.RotateTo(degrees, 600, EasingTypes.OutQuint);
             }
 
-            tooltip.Position = new Vector2(state.Mouse.Position.X,ActiveCursor.BoundingBox.Bottom);
+            tooltip.Position = new Vector2(state.Mouse.Position.X,Math.Min(ActiveCursor.BoundingBox.Bottom, state.Mouse.Position.Y + ActiveCursor.DrawHeight));
             tooltip.MouseState = state.Mouse;
 
             return base.OnMouseMove(state);
diff --git a/osu.Game/Graphics/Cursor/Tooltip.cs b/osu.Game/Graphics/Cursor/Tooltip.cs
index 9e6a0695d6..86751ddd65 100644
--- a/osu.Game/Graphics/Cursor/Tooltip.cs
+++ b/osu.Game/Graphics/Cursor/Tooltip.cs
@@ -99,7 +99,6 @@ namespace osu.Game.Graphics.Cursor
 
         protected override void Update()
         {
-            Scheduler.Update();
             if (overhang?.Overhanging ?? false)
                 TooltipText = overhang.Tooltip;
             else if (overhang != null)