diff --git a/src/components/playlist/PlaylistHero.tsx b/src/components/playlist/PlaylistHero.tsx
new file mode 100644
index 00000000..3b0bc30a
--- /dev/null
+++ b/src/components/playlist/PlaylistHero.tsx
@@ -0,0 +1,231 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+import {
+  Camera, ChevronLeft, Download, FileUp, Globe, HardDriveDownload, ListPlus,
+  Loader2, Lock, Pencil, Play, Search, Shuffle, Sparkles, Trash2,
+} from 'lucide-react';
+import type { SubsonicPlaylist, SubsonicSong } from '../../api/subsonicTypes';
+import type { ZipDownload } from '../../store/zipDownloadStore';
+import { useThemeStore } from '../../store/themeStore';
+import {
+  displayPlaylistName, formatSize, isSmartPlaylistName, totalDurationLabel,
+} from '../../utils/playlistDetailHelpers';
+import CachedImage from '../CachedImage';
+
+interface Props {
+  playlist: SubsonicPlaylist;
+  songs: SubsonicSong[];
+  id: string | undefined;
+  customCoverId: string | null;
+  customCoverFetchUrl: string | null;
+  customCoverCacheKey: string | null;
+  coverQuadUrls: ({ src: string; cacheKey: string } | null)[];
+  resolvedBgUrl: string | null;
+  saving: boolean;
+  searchOpen: boolean;
+  csvImporting: boolean;
+  activeZip: ZipDownload | undefined;
+  isCached: boolean;
+  isDownloading: boolean;
+  offlineProgress: { done: number; total: number } | null;
+  activeServerId: string;
+  setEditingMeta: React.Dispatch<React.SetStateAction<boolean>>;
+  setSearchOpen: React.Dispatch<React.SetStateAction<boolean>>;
+  setSearchQuery: React.Dispatch<React.SetStateAction<string>>;
+  setSearchResults: React.Dispatch<React.SetStateAction<SubsonicSong[]>>;
+  setSelectedSearchIds: React.Dispatch<React.SetStateAction<Set<string>>>;
+  setSearchPlPickerOpen: React.Dispatch<React.SetStateAction<boolean>>;
+  handlePlayAll: () => void;
+  handleShuffleAll: () => void;
+  handleEnqueueAll: () => void;
+  handleImportCsv: () => void;
+  handleDownload: () => void;
+  deleteAlbum: (id: string, serverId: string) => void;
+  downloadPlaylist: (id: string, name: string, coverArt: string | undefined, songs: SubsonicSong[], serverId: string) => void;
+}
+
+export default function PlaylistHero({
+  playlist, songs, id,
+  customCoverId, customCoverFetchUrl, customCoverCacheKey, coverQuadUrls,
+  resolvedBgUrl, saving, searchOpen, csvImporting, activeZip,
+  isCached, isDownloading, offlineProgress, activeServerId,
+  setEditingMeta, setSearchOpen, setSearchQuery, setSearchResults,
+  setSelectedSearchIds, setSearchPlPickerOpen,
+  handlePlayAll, handleShuffleAll, handleEnqueueAll, handleImportCsv, handleDownload,
+  deleteAlbum, downloadPlaylist,
+}: Props) {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const enableCoverArtBackground = useThemeStore(s => s.enableCoverArtBackground);
+  const enablePlaylistCoverPhoto = useThemeStore(s => s.enablePlaylistCoverPhoto);
+
+  return (
+    <div className="album-detail-header">
+      {resolvedBgUrl && enableCoverArtBackground && (
+        <>
+          <div className="album-detail-bg" style={{ backgroundImage: `url(${resolvedBgUrl})` }} aria-hidden="true" />
+          <div className="album-detail-overlay" aria-hidden="true" />
+        </>
+      )}
+
+      <div className="album-detail-content">
+        <button className="btn btn-ghost album-detail-back" onClick={() => navigate('/playlists')}>
+          <ChevronLeft size={16} /> {t('playlists.title')}
+        </button>
+
+        <div className="album-detail-hero">
+          {/* Cover — click to open edit modal */}
+          {enablePlaylistCoverPhoto && (
+            <div
+              className="playlist-hero-cover"
+              onClick={() => setEditingMeta(true)}
+            >
+              {customCoverId && customCoverFetchUrl && customCoverCacheKey ? (
+                <CachedImage
+                  src={customCoverFetchUrl}
+                  cacheKey={customCoverCacheKey}
+                  alt=""
+                  className="playlist-cover-grid"
+                  style={{ objectFit: 'cover', display: 'block' }}
+                />
+              ) : (
+                <div className="playlist-cover-grid">
+                  {coverQuadUrls.map((entry, i) =>
+                    entry
+                      ? <CachedImage key={i} className="playlist-cover-cell" src={entry.src} cacheKey={entry.cacheKey} alt="" />
+                      : <div key={i} className="playlist-cover-cell playlist-cover-cell--empty" />
+                  )}
+                </div>
+              )}
+              <div className="playlist-hero-cover-overlay">
+                <Camera size={28} />
+              </div>
+            </div>
+          )}
+
+          <div className="album-detail-meta">
+            <>
+              <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+                <h1 className="album-detail-title" style={{ marginBottom: 0, marginTop: 6, display: 'flex', alignItems: 'center', gap: 8 }}>
+                  {isSmartPlaylistName(playlist.name) && <Sparkles size={16} style={{ color: 'var(--text-muted)' }} />}
+                  <span>{displayPlaylistName(playlist.name)}</span>
+                </h1>
+                <button
+                  className="btn btn-ghost"
+                  onClick={() => setEditingMeta(true)}
+                  data-tooltip={t('playlists.editMeta')}
+                  style={{ padding: '4px 6px', opacity: 0.7, flexShrink: 0 }}
+                >
+                  <Pencil size={14} />
+                </button>
+              </div>
+              {playlist.comment && (
+                <div style={{ fontSize: 13, color: 'var(--text-muted)', marginTop: 2 }}>{playlist.comment}</div>
+              )}
+            </>
+            <div className="album-detail-info">
+              <span>{t('playlists.songs', { n: songs.length })}</span>
+              {songs.length > 0 && <span>· {totalDurationLabel(songs)}</span>}
+              {playlist.public !== undefined && (
+                <span style={{ display: 'inline-flex', alignItems: 'center', gap: 3 }}>
+                  · {playlist.public
+                    ? <><Globe size={11} /> {t('playlists.publicLabel')}</>
+                    : <><Lock size={11} /> {t('playlists.privateLabel')}</>}
+                </span>
+              )}
+              {saving && <Loader2 size={12} className="spin-slow" style={{ display: 'inline', marginLeft: 4 }} />}
+            </div>
+            <div className="album-detail-actions">
+              <div className="album-detail-actions-primary">
+                <button className="btn btn-primary" disabled={songs.length === 0} onClick={handlePlayAll}>
+                  <Play size={15} /> {t('common.play', 'Reproducir')}
+                </button>
+                <button
+                  className="btn btn-ghost"
+                  disabled={songs.length === 0}
+                  onClick={handleShuffleAll}
+                  data-tooltip={t('playlists.shuffle', 'Shuffle')}
+                >
+                  <Shuffle size={16} />
+                </button>
+                <button
+                  className="btn btn-ghost"
+                  disabled={songs.length === 0}
+                  onClick={handleEnqueueAll}
+                  data-tooltip={t('playlists.addToQueue')}
+                >
+                  <ListPlus size={16} />
+                </button>
+              </div>
+              <button
+                className={`btn btn-ghost ${searchOpen ? 'active' : ''}`}
+                onClick={() => { setSearchOpen(v => !v); setSearchQuery(''); setSearchResults([]); setSelectedSearchIds(new Set()); setSearchPlPickerOpen(false); }}
+              >
+                <Search size={16} /> {t('playlists.addSongs')}
+              </button>
+              <button
+                className="btn btn-ghost"
+                onClick={handleImportCsv}
+                disabled={csvImporting}
+                data-tooltip={t('playlists.importCSVTooltip')}
+              >
+                {csvImporting ? <Loader2 size={16} className="spin-slow" /> : <FileUp size={16} />}
+                {t('playlists.importCSV')}
+              </button>
+              {/* search close resets selection */}
+              {songs.length > 0 && (
+                activeZip && !activeZip.done && !activeZip.error ? (
+                  <div className="download-progress-wrap">
+                    <Download size={14} />
+                    <div className="download-progress-bar">
+                      <div className="download-progress-fill" style={{ width: `${activeZip.total ? Math.round((activeZip.bytes / activeZip.total) * 100) : 0}%` }} />
+                    </div>
+                    <span className="download-progress-pct">{activeZip.total ? Math.round((activeZip.bytes / activeZip.total) * 100) : '…'}%</span>
+                  </div>
+                ) : (
+                  <button className="btn btn-ghost" onClick={handleDownload} data-tooltip={t('playlists.downloadZip')}>
+                    <Download size={16} /> {t('playlists.downloadZip')}{songs.reduce((acc, s) => acc + (s.size ?? 0), 0) > 0 ? ` · ${formatSize(songs.reduce((acc, s) => acc + (s.size ?? 0), 0))}` : ''}
+                  </button>
+                )
+              )}
+              {songs.length > 0 && id && (
+                <button
+                  className={`btn btn-ghost${isCached ? ' btn-danger' : ''}`}
+                  disabled={isDownloading}
+                  onClick={() => {
+                    if (isCached) {
+                      deleteAlbum(id, activeServerId);
+                    } else if (playlist) {
+                      downloadPlaylist(id, playlist.name, playlist.coverArt, songs, activeServerId);
+                    }
+                  }}
+                  data-tooltip={isDownloading
+                    ? t('albumDetail.offlineDownloading', { n: offlineProgress?.done ?? 0, total: offlineProgress?.total ?? 0 })
+                    : isCached ? t('playlists.removeOffline') : t('playlists.cacheOffline')}
+                >
+                  {isDownloading ? (
+                    <>
+                      <div className="spinner" style={{ width: 14, height: 14, borderTopColor: 'currentColor' }} />
+                      {t('albumDetail.offlineDownloading', { n: offlineProgress?.done ?? 0, total: offlineProgress?.total ?? 0 })}
+                    </>
+                  ) : isCached ? (
+                    <>
+                      <Trash2 size={16} />
+                      {t('playlists.removeOffline')}
+                    </>
+                  ) : (
+                    <>
+                      <HardDriveDownload size={16} />
+                      {t('playlists.cacheOffline')}
+                    </>
+                  )}
+                </button>
+              )}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/pages/PlaylistDetail.tsx b/src/pages/PlaylistDetail.tsx
index 5072e19f..0745093f 100644
--- a/src/pages/PlaylistDetail.tsx
+++ b/src/pages/PlaylistDetail.tsx
@@ -43,6 +43,7 @@ import PlaylistEditModal from '../components/playlist/PlaylistEditModal';
 import CsvImportReportModal from '../components/playlist/CsvImportReportModal';
 import PlaylistSongSearchPanel from '../components/playlist/PlaylistSongSearchPanel';
 import PlaylistSuggestions from '../components/playlist/PlaylistSuggestions';
+import PlaylistHero from '../components/playlist/PlaylistHero';
 
 // ── Column configuration ──────────────────────────────────────────────────────
 const PL_COLUMNS: readonly ColDef[] = [
@@ -618,172 +619,37 @@ export default function PlaylistDetail() {
     <div className="album-detail animate-fade-in">
 
       {/* ── Hero ── */}
-      <div className="album-detail-header">
-        {resolvedBgUrl && enableCoverArtBackground && (
-          <>
-            <div className="album-detail-bg" style={{ backgroundImage: `url(${resolvedBgUrl})` }} aria-hidden="true" />
-            <div className="album-detail-overlay" aria-hidden="true" />
-          </>
-        )}
-
-        <div className="album-detail-content">
-          <button className="btn btn-ghost album-detail-back" onClick={() => navigate('/playlists')}>
-            <ChevronLeft size={16} /> {t('playlists.title')}
-          </button>
-
-          <div className="album-detail-hero">
-            {/* Cover — click to open edit modal */}
-            {enablePlaylistCoverPhoto && (
-              <div
-                className="playlist-hero-cover"
-                onClick={() => setEditingMeta(true)}
-              >
-                {customCoverId && customCoverFetchUrl && customCoverCacheKey ? (
-                  <CachedImage
-                    src={customCoverFetchUrl}
-                    cacheKey={customCoverCacheKey}
-                    alt=""
-                    className="playlist-cover-grid"
-                    style={{ objectFit: 'cover', display: 'block' }}
-                  />
-                ) : (
-                  <div className="playlist-cover-grid">
-                    {coverQuadUrls.map((entry, i) =>
-                      entry
-                        ? <CachedImage key={i} className="playlist-cover-cell" src={entry.src} cacheKey={entry.cacheKey} alt="" />
-                        : <div key={i} className="playlist-cover-cell playlist-cover-cell--empty" />
-                    )}
-                  </div>
-                )}
-                <div className="playlist-hero-cover-overlay">
-                  <Camera size={28} />
-                </div>
-              </div>
-            )}
-
-            <div className="album-detail-meta">
-              <>
-                <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
-                  <h1 className="album-detail-title" style={{ marginBottom: 0, marginTop: 6, display: 'flex', alignItems: 'center', gap: 8 }}>
-                    {isSmartPlaylistName(playlist.name) && <Sparkles size={16} style={{ color: 'var(--text-muted)' }} />}
-                    <span>{displayPlaylistName(playlist.name)}</span>
-                  </h1>
-                  <button
-                    className="btn btn-ghost"
-                    onClick={() => setEditingMeta(true)}
-                    data-tooltip={t('playlists.editMeta')}
-                    style={{ padding: '4px 6px', opacity: 0.7, flexShrink: 0 }}
-                  >
-                    <Pencil size={14} />
-                  </button>
-                </div>
-                {playlist.comment && (
-                  <div style={{ fontSize: 13, color: 'var(--text-muted)', marginTop: 2 }}>{playlist.comment}</div>
-                )}
-              </>
-              <div className="album-detail-info">
-                <span>{t('playlists.songs', { n: songs.length })}</span>
-                {songs.length > 0 && <span>· {totalDurationLabel(songs)}</span>}
-                {playlist.public !== undefined && (
-                  <span style={{ display: 'inline-flex', alignItems: 'center', gap: 3 }}>
-                    · {playlist.public
-                      ? <><Globe size={11} /> {t('playlists.publicLabel')}</>
-                      : <><Lock size={11} /> {t('playlists.privateLabel')}</>}
-                  </span>
-                )}
-                {saving && <Loader2 size={12} className="spin-slow" style={{ display: 'inline', marginLeft: 4 }} />}
-              </div>
-              <div className="album-detail-actions">
-                <div className="album-detail-actions-primary">
-                  <button className="btn btn-primary" disabled={songs.length === 0} onClick={handlePlayAll}>
-                    <Play size={15} /> {t('common.play', 'Reproducir')}
-                  </button>
-                  <button
-                    className="btn btn-ghost"
-                    disabled={songs.length === 0}
-                    onClick={handleShuffleAll}
-                    data-tooltip={t('playlists.shuffle', 'Shuffle')}
-                  >
-                    <Shuffle size={16} />
-                  </button>
-                  <button
-                    className="btn btn-ghost"
-                    disabled={songs.length === 0}
-                    onClick={handleEnqueueAll}
-                    data-tooltip={t('playlists.addToQueue')}
-                  >
-                    <ListPlus size={16} />
-                  </button>
-                </div>
-                <button
-                  className={`btn btn-ghost ${searchOpen ? 'active' : ''}`}
-                  onClick={() => { setSearchOpen(v => !v); setSearchQuery(''); setSearchResults([]); setSelectedSearchIds(new Set()); setSearchPlPickerOpen(false); }}
-                >
-                  <Search size={16} /> {t('playlists.addSongs')}
-                </button>
-                <button
-                  className="btn btn-ghost"
-                  onClick={handleImportCsv}
-                  disabled={csvImporting}
-                  data-tooltip={t('playlists.importCSVTooltip')}
-                >
-                  {csvImporting ? <Loader2 size={16} className="spin-slow" /> : <FileUp size={16} />}
-                  {t('playlists.importCSV')}
-                </button>
-                {/* search close resets selection */}
-                {songs.length > 0 && (
-                  activeZip && !activeZip.done && !activeZip.error ? (
-                    <div className="download-progress-wrap">
-                      <Download size={14} />
-                      <div className="download-progress-bar">
-                        <div className="download-progress-fill" style={{ width: `${activeZip.total ? Math.round((activeZip.bytes / activeZip.total) * 100) : 0}%` }} />
-                      </div>
-                      <span className="download-progress-pct">{activeZip.total ? Math.round((activeZip.bytes / activeZip.total) * 100) : '…'}%</span>
-                    </div>
-                  ) : (
-                    <button className="btn btn-ghost" onClick={handleDownload} data-tooltip={t('playlists.downloadZip')}>
-                      <Download size={16} /> {t('playlists.downloadZip')}{songs.reduce((acc, s) => acc + (s.size ?? 0), 0) > 0 ? ` · ${formatSize(songs.reduce((acc, s) => acc + (s.size ?? 0), 0))}` : ''}
-                    </button>
-                  )
-                )}
-                {songs.length > 0 && id && (
-                  <button
-                    className={`btn btn-ghost${isCached ? ' btn-danger' : ''}`}
-                    disabled={isDownloading}
-                    onClick={() => {
-                      if (isCached) {
-                        deleteAlbum(id, activeServerId);
-                      } else if (playlist) {
-                        downloadPlaylist(id, playlist.name, playlist.coverArt, songs, activeServerId);
-                      }
-                    }}
-                    data-tooltip={isDownloading
-                      ? t('albumDetail.offlineDownloading', { n: offlineProgress?.done ?? 0, total: offlineProgress?.total ?? 0 })
-                      : isCached ? t('playlists.removeOffline') : t('playlists.cacheOffline')}
-                  >
-                    {isDownloading ? (
-                      <>
-                        <div className="spinner" style={{ width: 14, height: 14, borderTopColor: 'currentColor' }} />
-                        {t('albumDetail.offlineDownloading', { n: offlineProgress?.done ?? 0, total: offlineProgress?.total ?? 0 })}
-                      </>
-                    ) : isCached ? (
-                      <>
-                        <Trash2 size={16} />
-                        {t('playlists.removeOffline')}
-                      </>
-                    ) : (
-                      <>
-                        <HardDriveDownload size={16} />
-                        {t('playlists.cacheOffline')}
-                      </>
-                    )}
-                  </button>
-                )}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
+      <PlaylistHero
+        playlist={playlist}
+        songs={songs}
+        id={id}
+        customCoverId={customCoverId}
+        customCoverFetchUrl={customCoverFetchUrl}
+        customCoverCacheKey={customCoverCacheKey}
+        coverQuadUrls={coverQuadUrls}
+        resolvedBgUrl={resolvedBgUrl}
+        saving={saving}
+        searchOpen={searchOpen}
+        csvImporting={csvImporting}
+        activeZip={activeZip}
+        isCached={isCached}
+        isDownloading={isDownloading}
+        offlineProgress={offlineProgress}
+        activeServerId={activeServerId}
+        setEditingMeta={setEditingMeta}
+        setSearchOpen={setSearchOpen}
+        setSearchQuery={setSearchQuery}
+        setSearchResults={setSearchResults}
+        setSelectedSearchIds={setSelectedSearchIds}
+        setSearchPlPickerOpen={setSearchPlPickerOpen}
+        handlePlayAll={handlePlayAll}
+        handleShuffleAll={handleShuffleAll}
+        handleEnqueueAll={handleEnqueueAll}
+        handleImportCsv={handleImportCsv}
+        handleDownload={handleDownload}
+        deleteAlbum={deleteAlbum}
+        downloadPlaylist={downloadPlaylist}
+      />
 
       {/* ── Song search panel ── */}
       {searchOpen && (