diff --git a/Shared/Player/Controls/PlayerControls.swift b/Shared/Player/Controls/PlayerControls.swift
index 8bcaa318..0f88cc54 100644
--- a/Shared/Player/Controls/PlayerControls.swift
+++ b/Shared/Player/Controls/PlayerControls.swift
@@ -192,24 +192,25 @@ struct PlayerControls: View {
     }
 
     var buttonsBar: some View {
-        HStack(spacing: 20) {
+        HStack {
             #if !os(tvOS)
                 #if os(iOS)
                     hidePlayerButton
                 #endif
 
                 fullscreenButton
+
                 #if os(iOS)
                     pipButton
                 #endif
-                rateButton
-
-                closeVideoButton
-
-                button("Music Mode", systemImage: "music.note", active: player.musicMode, action: player.toggleMusicMode)
-                    .disabled(player.activeBackend == .appleAVPlayer)
 
                 Spacer()
+
+                rateButton
+
+                musicModeButton
+
+                closeVideoButton
             #endif
         }
     }
@@ -272,6 +273,11 @@ struct PlayerControls: View {
         }
     }
 
+    private var musicModeButton: some View {
+        button("Music Mode", systemImage: "music.note", active: player.musicMode, action: player.toggleMusicMode)
+            .disabled(player.activeBackend == .appleAVPlayer)
+    }
+
     var ratePicker: some View {
         Picker("Rate", selection: rateBinding) {
             ForEach(PlayerModel.availableRates, id: \.self) { rate in