diff --git a/osu.Game/Graphics/UserInterface/TriangleButton.cs b/osu.Game/Graphics/UserInterface/TriangleButton.cs
index 31fe29fc3a..2375017878 100644
--- a/osu.Game/Graphics/UserInterface/TriangleButton.cs
+++ b/osu.Game/Graphics/UserInterface/TriangleButton.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Graphics.UserInterface
             });
         }
 
-        public IEnumerable<string> FilterTerms => new[] { Text };
+        public virtual IEnumerable<string> FilterTerms => new[] { Text };
 
         public bool MatchingFilter
         {
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs
index efe3d782ae..3f1e77d482 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs
@@ -16,6 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 new SettingsButton
                 {
                     Text = "Key configuration",
+                    TooltipText = "Change global shortcut keys and gameplay bindings",
                     Action = keyConfig.ToggleVisibility
                 },
             };
diff --git a/osu.Game/Overlays/Settings/SettingsButton.cs b/osu.Game/Overlays/Settings/SettingsButton.cs
index 73cf855e18..ef98c28285 100644
--- a/osu.Game/Overlays/Settings/SettingsButton.cs
+++ b/osu.Game/Overlays/Settings/SettingsButton.cs
@@ -1,17 +1,33 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings
 {
-    public class SettingsButton : TriangleButton
+    public class SettingsButton : TriangleButton, IHasTooltip
     {
         public SettingsButton()
         {
             RelativeSizeAxes = Axes.X;
             Padding = new MarginPadding { Left = SettingsOverlay.CONTENT_MARGINS, Right = SettingsOverlay.CONTENT_MARGINS };
         }
+
+        public string TooltipText { get; set; }
+
+        public override IEnumerable<string> FilterTerms
+        {
+            get
+            {
+                if (TooltipText != null)
+                    return base.FilterTerms.Append(TooltipText);
+
+                return base.FilterTerms;
+            }
+        }
     }
 }