diff --git a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
index 4a67bac6c..fc6aa2b9d 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
@@ -155,9 +155,10 @@ class AlbumDetailFragment : DetailFragment() {
      */
     private fun scrollToItem(id: Long, adapter: AlbumDetailAdapter) {
         // Calculate where the item for the currently played song is
-        val pos = adapter.currentList.indexOfFirst { it.id == id && it is Album }
+        val pos = adapter.currentList.indexOfFirst { it.id == id && it is Song }
 
         if (pos != -1) {
+            logD("IDIOT.")
             binding.detailRecycler.post {
                 // Make sure to increment the position to make up for the detail header
                 binding.detailRecycler.layoutManager?.startSmoothScroll(
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt
index 275458cb2..fee2bd3d5 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt
@@ -148,7 +148,7 @@ class AlbumDetailAdapter(
                 text = data.artist.name
 
                 setOnClickListener {
-                    detailModel.navToItem(data)
+                    detailModel.navToItem(data.artist)
                 }
             }