diff --git a/Shared/Playlists/PlaylistsView.swift b/Shared/Playlists/PlaylistsView.swift
index d5bec8d8..96638f17 100644
--- a/Shared/Playlists/PlaylistsView.swift
+++ b/Shared/Playlists/PlaylistsView.swift
@@ -101,20 +101,28 @@ struct PlaylistsView: View {
                                         .foregroundColor(.secondary)
                                 } else {
                                     selectPlaylistButton
+                                        .frame(maxWidth: 140)
                                 }
 
-                                playButton
-                                shuffleButton
-
                                 Spacer()
 
-                                newPlaylistButton
-
                                 if currentPlaylist != nil {
-                                    editPlaylistButton
+                                    HStack(spacing: 10) {
+                                        playButton
+                                        shuffleButton
+                                    }
+
+                                    Spacer()
+                                }
+
+                                HStack(spacing: 2) {
+                                    newPlaylistButton
+
+                                    if currentPlaylist != nil {
+                                        editPlaylistButton
+                                    }
                                 }
                             }
-                            .transaction { t in t.animation = .none }
                         }
                     #endif
                 }