diff --git a/osu.Game/Graphics/UserInterface/SearchTextBox.cs b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
index 0a37024d0f..39db8d8be7 100644
--- a/osu.Game/Graphics/UserInterface/SearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Graphics.UserInterface
                     case Key.Up:
                     case Key.Down:
                         return false;
+                    case Key.KeypadEnter:
                     case Key.Enter:
                         if (!AllowCommit) return false;
                         break;
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 212b60f4b8..97d8f03b9b 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Dialog
         {
             if (args.Repeat) return false;
 
-            if (args.Key == Key.Enter)
+            if (args.Key == Key.Enter || args.Key == Key.KeypadEnter)
             {
                 Buttons.OfType<PopupDialogOkButton>().FirstOrDefault()?.TriggerOnClick();
                 return true;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 41fa53e8a3..dc6dfdfd81 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -371,6 +371,7 @@ namespace osu.Game.Screens.Select
 
             switch (args.Key)
             {
+                case Key.KeypadEnter:
                 case Key.Enter:
                     raiseSelect();
                     return true;