diff --git a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
index a611af6f4..b0bc09386 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
@@ -221,8 +221,16 @@ class ArtistDetailFragment :
                         .navigateSafe(ArtistDetailFragmentDirections.showArtist(show.artist.uid))
                 }
             }
-            is Show.SongArtistDecision,
-            is Show.AlbumArtistDecision,
+            is Show.SongArtistDecision -> {
+                logD("Navigating to artist choices for ${show.song}")
+                findNavController()
+                    .navigateSafe(ArtistDetailFragmentDirections.showArtistChoices(show.song.uid))
+            }
+            is Show.AlbumArtistDecision -> {
+                logD("Navigating to artist choices for ${show.album}")
+                findNavController()
+                    .navigateSafe(ArtistDetailFragmentDirections.showArtistChoices(show.album.uid))
+            }
             is Show.GenreDetails,
             is Show.PlaylistDetails -> {
                 error("Unexpected show command $show")
diff --git a/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt
index 57e2bdf7c..7e7aec2ac 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt
@@ -76,7 +76,7 @@ class AddToPlaylistDialog :
 
         // --- VIEWMODEL SETUP ---
         pickerModel.setSongsToAdd(args.songUids)
-        collect(musicModel.playlistDecision.flow, ::handleDecision)
+        musicModel.playlistDecision.consume()
         collectImmediately(pickerModel.currentSongsToAdd, ::updatePendingSongs)
         collectImmediately(pickerModel.playlistAddChoices, ::updatePlaylistChoices)
     }
diff --git a/app/src/main/res/navigation/inner.xml b/app/src/main/res/navigation/inner.xml
index b1f834f95..a974b3360 100644
--- a/app/src/main/res/navigation/inner.xml
+++ b/app/src/main/res/navigation/inner.xml
@@ -263,6 +263,9 @@
         <action
             android:id="@+id/show_artist"
             app:destination="@id/artist_detail_fragment" />
+        <action
+            android:id="@+id/show_artist_choices"
+            app:destination="@id/show_artist_choices_dialog" />
         <action
             android:id="@+id/open_song_menu"
             app:destination="@id/song_menu_dialog" />