diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index fa2aac6fae..78dd60d560 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -51,7 +51,11 @@ namespace osu.Game.Screens.Select
                 }
             };
 
-            searchTextBox.OnChange += (sender, text) => FilterChanged?.Invoke();
+            searchTextBox.OnCommit += (sender, newText) =>
+            {
+                if (newText)
+                    FilterChanged?.Invoke();
+            };
             searchTextBox.Exit = () => Exit?.Invoke();
         }
 
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 75c6d56b0d..27d37e7028 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -189,13 +189,9 @@ namespace osu.Game.Screens.Select
         }
 
         private ScheduledDelegate filterTask;
-        private string previousFilter = string.Empty;
 
         private void filterChanged()
         {
-            if (previousFilter == filter.Search)
-                return;
-            previousFilter = filter.Search;
             filterTask?.Cancel();
             filterTask = Scheduler.AddDelayed(() =>
             {