diff --git a/Yattee/Views/Playlist/PlaylistFormSheet.swift b/Yattee/Views/Playlist/PlaylistFormSheet.swift
index 9742752d..10920589 100644
--- a/Yattee/Views/Playlist/PlaylistFormSheet.swift
+++ b/Yattee/Views/Playlist/PlaylistFormSheet.swift
@@ -136,31 +136,12 @@ struct PlaylistFormSheet: View {
     #if os(tvOS)
     private var tvOSContent: some View {
         VStack(spacing: 0) {
-            // Header
-            HStack {
-                Button(String(localized: "common.cancel")) {
-                    dismiss()
-                }
-                .buttonStyle(TVToolbarButtonStyle())
+            Text(navigationTitle)
+                .font(.title3)
+                .fontWeight(.semibold)
+                .lineLimit(1)
+                .padding(.top, 16)
 
-                Spacer()
-
-                Text(navigationTitle)
-                    .font(.title2)
-                    .fontWeight(.semibold)
-
-                Spacer()
-
-                Button(saveButtonTitle) {
-                    save()
-                }
-                .buttonStyle(TVToolbarButtonStyle())
-                .disabled(!canSave)
-            }
-            .padding(.horizontal, 48)
-            .padding(.vertical, 24)
-
-            // Form
             Form {
                 Section {
                     TVSettingsTextField(
@@ -187,7 +168,21 @@ struct PlaylistFormSheet: View {
                     }
                     .foregroundStyle(.secondary)
                 }
+
+                Section {
+                    Button(saveButtonTitle) {
+                        save()
+                    }
+                    .buttonStyle(TVToolbarButtonStyle())
+                    .lineLimit(1)
+                    .disabled(!canSave)
+                    .frame(maxWidth: .infinity, alignment: .center)
+                    .listRowBackground(Color.clear)
+                }
             }
+            .scrollClipDisabled()
+            .padding(.horizontal, 24)
+            .padding(.vertical, 16)
         }
     }
     #endif
diff --git a/Yattee/Views/Video/PlaylistSelectorSheet.swift b/Yattee/Views/Video/PlaylistSelectorSheet.swift
index 42ec2126..a7a2237e 100644
--- a/Yattee/Views/Video/PlaylistSelectorSheet.swift
+++ b/Yattee/Views/Video/PlaylistSelectorSheet.swift
@@ -79,6 +79,11 @@ struct PlaylistSelectorSheet: View {
                     }
                 }
             }
+            #if os(tvOS)
+            .scrollClipDisabled()
+            .padding(.horizontal, 40)
+            .padding(.vertical, 24)
+            #else
             .navigationTitle(String(localized: "playlist.addTo"))
             #if os(iOS)
             .navigationBarTitleDisplayMode(.inline)
@@ -93,6 +98,7 @@ struct PlaylistSelectorSheet: View {
                     }
                 }
             }
+            #endif
             .sheet(isPresented: $showingNewPlaylist) {
                 PlaylistFormSheet(mode: .create) { title, description in
                     pendingPlaylistTitle = title