diff --git a/src/components.js b/src/components.js
index 9a39b32..826939f 100644
--- a/src/components.js
+++ b/src/components.js
@@ -27,7 +27,7 @@ export function makeAlbumCard(a) {
 }
 
 // ─── SONG LIST ITEM (library) ───
-export function makeSongItem(s, idx, list, { noArtistLink = false, noAlbumLink = false } = {}) {
+export function makeSongItem(s, idx, list, { noArtistLink = false } = {}) {
   const el = document.createElement('div');
   if(s.starred && !s._starred) s._starred = true;
   el.className = 'song-item' + (S.queue[S.qIdx]?.id === s.id ? ' playing' : '');
@@ -40,10 +40,7 @@ export function makeSongItem(s, idx, list, { noArtistLink = false, noAlbumLink =
         : `<span class="song-link" onclick="event.stopPropagation();s_goArtist(event,'${esc(a.name)}','${a.id||''}')">${esc(a.name)}</span>`
       ).join('<span style="color:var(--text3)"> • </span>')
     : '';
-  // Hide album in subtitle when it's identical to the track title (common for singles)
-  const albumHtml = !noAlbumLink && (s.albumId||s.album) && s.album !== s.title
-    ? `<span style="color:var(--text3)"> · </span><span class="song-link" onclick="event.stopPropagation();s_goAlbum(event,'${s.albumId||''}','${esc(s.album||'')}','${esc(s.artist||'')}','${s.artistId||''}')">${esc(s.album||'')}</span>`
-    : '';
+
   const playsHtml = S.cfg.showPlayCount
     ? `<span class="song-plays">${s.playCount ? s.playCount.toLocaleString() + '<span class="song-plays-x">×</span>' : '—'}</span>`
     : '';
@@ -51,7 +48,7 @@ export function makeSongItem(s, idx, list, { noArtistLink = false, noAlbumLink =
     <div class="song-thumb">${cv ? `<img src="${cv}" loading="lazy" onerror="this.parentNode.innerHTML='<div class=\\'no-art\\'>♪</div>'">` : '<div class="no-art">♪</div>'}</div>
     <div class="song-info">
       <div class="song-title">${esc(s.title)}</div>
-      <div class="song-artist">${artistHtml}${albumHtml}</div>
+      <div class="song-artist">${artistHtml}</div>
     </div>
     <div class="song-meta">
       <span class="song-dur">${formatDur(s.duration)}</span>
diff --git a/src/ui.js b/src/ui.js
index b7499d7..aa711be 100644
--- a/src/ui.js
+++ b/src/ui.js
@@ -135,6 +135,7 @@ export function showCtxMenu(e, song, list, idx) {
           .catch(err => toast('Fehler: ' + err.message));
     }},
     { sep: true },
+    { icon: '💿', label: 'Zum Album', fn: () => song.albumId && navigate('album-detail', { id: song.albumId, name: song.album||'', artist: song.artist||'', artistId: song.artistId||'', coverArt: song.coverArt||'' }) },
     { icon: 'ℹ', label: 'Song-Info', fn: () => showSongInfo(song) },
     { icon: '⬇', label: 'Herunterladen', fn: () => dlSongLocal(song) },
   ];
diff --git a/src/views.js b/src/views.js
index d4f417a..24bb497 100644
--- a/src/views.js
+++ b/src/views.js
@@ -644,7 +644,7 @@ export async function loadAlbumDetail(album) {
       toast(`⬇ ${songs.length} Titel Download gestartet`);
     };
     sl.innerHTML = '';
-    songs.forEach((s,i) => sl.appendChild(makeSongItem(s, i, songs, { noAlbumLink: true })));
+    songs.forEach((s,i) => sl.appendChild(makeSongItem(s, i, songs)));
   } catch(e) { sl.innerHTML = `<p style="color:var(--danger)">${e.message}</p>`; }
 }
 
@@ -711,7 +711,7 @@ export async function loadPlaylistDetail(pl) {
     sl.innerHTML = '';
     const plSearch = document.getElementById('playlist-search');
     if (plSearch) plSearch.value = '';
-    songs.forEach((s,i) => sl.appendChild(makeSongItem(s, i, songs, { noArtistLink: true, noAlbumLink: true })));
+    songs.forEach((s,i) => sl.appendChild(makeSongItem(s, i, songs, { noArtistLink: true })));
     _setupReorderMode(sl, songs, S._currentPlaylist);
   } catch(e) { sl.innerHTML = `<p style="color:var(--danger)">${e.message}</p>`; }
 }
@@ -880,7 +880,7 @@ export async function loadStarred(sort = _starredSort) {
     else if (sort === 'plays')  songs.sort((a, b) => (b.playCount||0) - (a.playCount||0));
     el.innerHTML = '';
     if(!songs.length) { el.innerHTML = '<div class="empty-state"><div class="icon">⭐</div><p>Noch keine Favoriten</p></div>'; return; }
-    songs.forEach((s,i) => el.appendChild(makeSongItem(s, i, songs, { noArtistLink: true, noAlbumLink: true })));
+    songs.forEach((s,i) => el.appendChild(makeSongItem(s, i, songs, { noArtistLink: true })));
   } catch(e) { el.innerHTML = `<p style="color:var(--danger)">${e.message}</p>`; }
 }