diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index a4a7ac5c9d..d613ce649a 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -137,6 +137,8 @@ namespace osu.Game.Screens.Select
 
         public void Deactivate()
         {
+            searchTextBox.ReadOnly = true;
+
             searchTextBox.HoldFocus = false;
             if (searchTextBox.HasFocus)
                 GetContainingInputManager().ChangeFocus(searchTextBox);
@@ -144,6 +146,7 @@ namespace osu.Game.Screens.Select
 
         public void Activate()
         {
+            searchTextBox.ReadOnly = false;
             searchTextBox.HoldFocus = true;
         }
 
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 9e2f5761dd..8b0547376d 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Screens.Select
             switch (e.Key)
             {
                 case Key.Enter:
+                case Key.KeypadEnter:
                     // this is a special hard-coded case; we can't rely on OnPressed (of SongSelect) as GlobalActionContainer is
                     // matching with exact modifier consideration (so Ctrl+Enter would be ignored).
                     FinaliseSelection();