diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneHistoryTextBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneHistoryTextBox.cs
index 414c1276e1..29f1e29b55 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneHistoryTextBox.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneHistoryTextBox.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -101,7 +102,13 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("Remove text", () => box.Text = string.Empty);
             AddStep("Move Up", () => InputManager.Key(Key.Up));
-            AddAssert("Text unchanged", () => box.Text == string.Empty);
+            AddAssert("Same as previous message", () => box.Text == "Message 2");
+
+            AddStep("Move Up", () => InputManager.Key(Key.Up));
+            AddStep("Select text", () => InputManager.Keys(PlatformAction.SelectAll));
+            AddStep("Replace text", () => box.Text = "New text");
+            AddStep("Move Up", () => InputManager.Key(Key.Up));
+            AddAssert("Same as previous message", () => box.Text == "Message 2");
         }
 
         private void addMessages(int count)
diff --git a/osu.Game/Graphics/UserInterface/HistoryTextBox.cs b/osu.Game/Graphics/UserInterface/HistoryTextBox.cs
index 290457564b..f2b975226c 100644
--- a/osu.Game/Graphics/UserInterface/HistoryTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/HistoryTextBox.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Graphics.UserInterface
         private int selectedIndex;
 
         private string originalMessage = string.Empty;
+        private bool everythingSelected;
 
         /// <summary>
         /// Creates a new <see cref="HistoryTextBox"/>.
@@ -33,6 +34,29 @@ namespace osu.Game.Graphics.UserInterface
         public HistoryTextBox(int capacity = 100)
         {
             messageHistory = new LimitedCapacityQueue<string>(capacity);
+
+            Current.ValueChanged += text =>
+            {
+                if (string.IsNullOrEmpty(text.NewValue) || everythingSelected)
+                {
+                    selectedIndex = HistoryCount;
+                    everythingSelected = false;
+                }
+            };
+        }
+
+        protected override void OnTextDeselected()
+        {
+            base.OnTextDeselected();
+
+            everythingSelected = false;
+        }
+
+        protected override void OnTextSelectionChanged(TextSelectionType selectionType)
+        {
+            base.OnTextSelectionChanged(selectionType);
+
+            everythingSelected = SelectedText == Text;
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
@@ -43,6 +67,8 @@ namespace osu.Game.Graphics.UserInterface
                     if (selectedIndex == 0)
                         return true;
 
+                    everythingSelected = false;
+
                     if (selectedIndex == HistoryCount)
                         originalMessage = Text;
 
@@ -54,6 +80,8 @@ namespace osu.Game.Graphics.UserInterface
                     if (selectedIndex == HistoryCount)
                         return true;
 
+                    everythingSelected = false;
+
                     if (selectedIndex == HistoryCount - 1)
                     {
                         selectedIndex = HistoryCount;