diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index e19beb68e..360a7d733 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -52,7 +52,6 @@ class MainActivity : AppCompatActivity() {
         // Since the activity is set to singleInstance [Given that there's only MainActivity]
         // We have to manually push the intent whenever we get one so that the fragments
         // can catch any file intents
-        // TODO: If possible try to make this system completely
         setIntent(intent)
     }
 
diff --git a/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt b/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
index 6b2505ba0..2ad0e22e6 100644
--- a/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
@@ -179,10 +179,13 @@ class SongsFragment : Fragment() {
                         indicatorCenterY: Int,
                         itemPosition: Int
                     ) {
-                        val layoutManager = binding.songRecycler.layoutManager
-                            as LinearLayoutManager
+                        binding.songRecycler.apply {
+                            (layoutManager as LinearLayoutManager).scrollToPositionWithOffset(
+                                itemPosition, 0
+                            )
 
-                        layoutManager.scrollToPositionWithOffset(itemPosition, 0)
+                            stopScroll()
+                        }
                     }
                 }
             )