diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index d12eaa10f6..cd8b486f23 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -64,12 +64,20 @@ namespace osu.Game.Input.Bindings
 
         protected override void ReloadMappings()
         {
+            var defaults = DefaultKeyBindings.ToList();
+
             if (ruleset != null && !ruleset.ID.HasValue)
                 // if the provided ruleset is not stored to the database, we have no way to retrieve custom bindings.
                 // fallback to defaults instead.
-                KeyBindings = DefaultKeyBindings;
+                KeyBindings = defaults;
             else
-                KeyBindings = store.Query(ruleset?.ID, variant).ToList();
+            {
+                KeyBindings = store.Query(ruleset?.ID, variant)
+                                   // this ordering is important to ensure that we read entries from the database in the order
+                                   // enforced by DefaultKeyBindings. allow for song select to handle actions that may otherwise
+                                   // have been eaten by the music controller due to query order.
+                                   .OrderBy(b => defaults.FindIndex(d => (int)d.Action == b.IntAction)).ToList();
+            }
         }
     }
 }
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index c2f707a4e8..042960d54c 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -28,10 +28,10 @@ namespace osu.Game.Input.Bindings
         }
 
         public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings
+                                                                       .Concat(EditorKeyBindings)
                                                                        .Concat(InGameKeyBindings)
-                                                                       .Concat(AudioControlKeyBindings)
                                                                        .Concat(SongSelectKeyBindings)
-                                                                       .Concat(EditorKeyBindings);
+                                                                       .Concat(AudioControlKeyBindings);
 
         public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {