diff --git a/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
index b08ecb0e61..a5771c595b 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
@@ -155,6 +155,10 @@ namespace osu.Game.Rulesets.Osu.Edit
                             Action = () => GridFromPointsClicked?.Invoke(),
                             RelativeSizeAxes = Axes.X,
                             Text = "Grid from points",
+                            TooltipText = """
+                                           Left click to set the origin.
+                                           Click and drag to set the origin, rotation and spacing.
+                                           """
                         },
                         gridTypeButtons = new EditorRadioButtonCollection
                         {
diff --git a/osu.Game/Graphics/UserInterfaceV2/RoundedButton.cs b/osu.Game/Graphics/UserInterfaceV2/RoundedButton.cs
index 6aded3fe32..a993867a93 100644
--- a/osu.Game/Graphics/UserInterfaceV2/RoundedButton.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/RoundedButton.cs
@@ -8,6 +8,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Backgrounds;
@@ -17,7 +18,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterfaceV2
 {
-    public partial class RoundedButton : OsuButton, IFilterable
+    public partial class RoundedButton : OsuButton, IFilterable, IHasTooltip
     {
         protected TrianglesV2? Triangles { get; private set; }
 
@@ -107,5 +108,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
         }
 
         public bool FilteringActive { get; set; }
+        public LocalisableString TooltipText { get; set; }
     }
 }