diff --git a/src/modals/SetlistSet.vue b/src/modals/SetlistSet.vue
index 5fcd4be7..f5d67822 100644
--- a/src/modals/SetlistSet.vue
+++ b/src/modals/SetlistSet.vue
@@ -15,7 +15,6 @@
 						v-model="setlist.title"
 						:class="{ '!border-rose-600': (error.title & !setlist.title) || error.slug }"
 						:placeholder="t('placeholder.exampleSetlistTitle')"
-						:disabled="existing"
 						required
 					/>
 					<div v-if="error.title & !setlist.title" class="text-rose-600">
@@ -355,7 +354,7 @@ const setlistSongs = ref(null);
 const initInput = () => {
 	resetErrors();
 	resetFilter();
-	const sl = props.initialSetlist;
+	const sl = {...props.initialSetlist};
 	// only show undeleted songs
 	sl.songs = sl.songs.filter(s => s.id in props.songs);
 	// init visibility state if not existing
diff --git a/src/views/SetlistShow.vue b/src/views/SetlistShow.vue
index bf0eabe2..ea9192c7 100644
--- a/src/views/SetlistShow.vue
+++ b/src/views/SetlistShow.vue
@@ -259,7 +259,14 @@
 								</td>
 								<td
 									class="cursor-pointer px-3 py-2 max-w-0 hidden 2xl:table-cell"
-									@click="router.push({ name: 'song-show', params: { id: element.id, key: element.tuning ? element.tuning : songs[element.id].tuning }})"
+									@click="router.push({
+										name: 'song-show',
+										params: {
+											id: element.id,
+											key: element.tuning ? element.tuning : songs[element.id].tuning,
+											setlist: setlistKey,
+										}
+									})"
 								>
 									<div class="truncate">{{ songs[element.id].authors }}</div>
 								</td>