diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 3a4bad43b3..2d5d049133 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -93,16 +93,22 @@ private void load(OsuColour colours)
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
-            updateText(e.ShiftPressed);
+            updateText(e);
             return base.OnKeyDown(e);
         }
 
         protected override void OnKeyUp(KeyUpEvent e)
         {
-            updateText(e.ShiftPressed);
+            updateText(e);
             base.OnKeyUp(e);
         }
 
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            updateText(e);
+            return base.OnMouseDown(e);
+        }
+
         protected override bool OnClick(ClickEvent e)
         {
             try
@@ -126,6 +132,8 @@ protected override void OnMouseUp(MouseUpEvent e)
                 rewindSearch = true;
                 TriggerClick();
             }
+
+            updateText(e);
         }
 
         public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
@@ -150,10 +158,12 @@ public override void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
             }
         }
 
-        private void updateText(bool rewind = false)
+        private void updateText(UIEvent e)
         {
-            randomSpriteText.Alpha = rewind ? 0 : 1;
-            rewindSpriteText.Alpha = rewind ? 1 : 0;
+            bool aboutToRewind = e.ShiftPressed || e.CurrentState.Mouse.IsPressed(MouseButton.Right);
+
+            randomSpriteText.Alpha = aboutToRewind ? 0 : 1;
+            rewindSpriteText.Alpha = aboutToRewind ? 1 : 0;
         }
     }
 }