diff --git a/osu.Game/Graphics/UserInterface/SearchTextBox.cs b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
index ecbd87f149..a2cd2ba5ea 100644
--- a/osu.Game/Graphics/UserInterface/SearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
@@ -42,10 +42,16 @@ namespace osu.Game.Graphics.UserInterface
                     case Key.Up:
                     case Key.Down:
                         return false;
+                }
+            }
+
+            if (!AllowCommit)
+            {
+                switch (args.Key)
+                {
                     case Key.KeypadEnter:
                     case Key.Enter:
-                        if (!AllowCommit) return false;
-                        break;
+                        return false;
                 }
             }