diff --git a/src/ui.js b/src/ui.js
index ce6a5d6..3cad145 100644
--- a/src/ui.js
+++ b/src/ui.js
@@ -357,13 +357,16 @@ async function _createNdPlaylist(tracks, name) {
       if (!t.trackName) continue;
       const missingLabel = t.artistName ? `${t.artistName} – ${t.trackName}` : t.trackName;
       try {
-        // Search with artist+title first for precision, fall back to title-only with more results
-        const artistQuery = t.artistName ? `${t.artistName} ${t.trackName}` : t.trackName;
-        const r = await api('search3', `&query=${encodeURIComponent(artistQuery)}&songCount=10&albumCount=0&artistCount=0`);
+        // Use first artist only for search to avoid comma/multi-artist confusion
+        const firstArtist = t.artistName ? t.artistName.split(/[,/•]/)[0].trim() : '';
+        const artistQuery = firstArtist ? `${firstArtist} ${t.trackName}` : t.trackName;
+        const r = await api('search3', `&query=${encodeURIComponent(artistQuery)}&songCount=20&albumCount=0&artistCount=0`);
         const songs = r.searchResult3?.song || [];
+        // Strip trailing punctuation from first word so "Kløn," matches "Kløn"
+        const firstWord = s => norm(s).split(/[\s,/•]+/)[0].replace(/\W+$/, '');
         const match = songs.find(s =>
           norm(s.title) === norm(t.trackName) &&
-          norm(s.artist).split(' ')[0] === norm(t.artistName).split(' ')[0]
+          firstWord(s.artist) === firstWord(firstArtist || t.artistName)
         ) || songs.find(s => norm(s.title) === norm(t.trackName));
         if (match) songIds.push(match.id);
         else missing.push(missingLabel);