diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90fdee88d..4bf5289ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,16 @@
 - Excessive CPU no longer spent showing music loading process
 - Fixed playback sheet flickering on warm start
 
+## 3.6.1
+
+#### What's Fixed
+- Fixed possible crash from poor service initalization
+- Fixed issue where it was impossible to edit playlists
+- Fixed issue where playlist would revert to older version when re-edited
+
+#### Dev/Meta
+- Fixed service memory leaks
+
 ## 3.6.0
 
 #### What's New
diff --git a/README.md b/README.md
index bef042877..8c8f010bd 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 <h1 align="center"><b>Auxio</b></h1>
 <h4 align="center">A simple, rational music player for android.</h4>
 <p align="center">
-    <a href="https://github.com/oxygencobalt/Auxio/releases/tag/v3.6.0">
-        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v3.6.0&color=64B5F6&style=flat">
+    <a href="https://github.com/oxygencobalt/Auxio/releases/tag/v3.6.1">
+        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v3.6.1&color=64B5F6&style=flat">
     </a>
     <a href="https://github.com/oxygencobalt/Auxio/releases/">
         <img alt="Releases" src="https://img.shields.io/github/downloads/OxygenCobalt/Auxio/total.svg?color=4B95DE&style=flat">
diff --git a/app/build.gradle b/app/build.gradle
index 87b32dc83..b1646e4db 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@ android {
 
     defaultConfig {
         applicationId namespace
-        versionName "3.6.0"
-        versionCode 50
+        versionName "3.6.1"
+        versionCode 51
 
         minSdk 24
         targetSdk 35
diff --git a/app/src/main/java/org/oxycblt/auxio/AuxioService.kt b/app/src/main/java/org/oxycblt/auxio/AuxioService.kt
index 6fb29284b..6f1b1a68c 100644
--- a/app/src/main/java/org/oxycblt/auxio/AuxioService.kt
+++ b/app/src/main/java/org/oxycblt/auxio/AuxioService.kt
@@ -51,8 +51,8 @@ class AuxioService :
     override fun onCreate() {
         super.onCreate()
         playbackFragment = playbackFragmentFactory.create(this, this)
-        sessionToken = playbackFragment.attach()
         musicFragment = musicFragmentFactory.create(this, this, this)
+        sessionToken = playbackFragment.attach()
         musicFragment.attach()
     }
 
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
index a2f502416..1d16d7992 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
@@ -35,6 +35,7 @@ import org.oxycblt.auxio.detail.list.EditHeader
 import org.oxycblt.auxio.detail.list.SortHeader
 import org.oxycblt.auxio.list.BasicHeader
 import org.oxycblt.auxio.list.Divider
+import org.oxycblt.auxio.list.Header
 import org.oxycblt.auxio.list.Item
 import org.oxycblt.auxio.list.ListSettings
 import org.oxycblt.auxio.list.adapter.UpdateInstructions
@@ -431,6 +432,7 @@ constructor(
             // TODO: The user could probably press some kind of button if they were fast enough.
             //  Think of a better way to handle this state.
             _editedPlaylist.value = null
+            refreshPlaylist(playlist.uid)
         }
     }
 
@@ -523,12 +525,13 @@ constructor(
             }
     }
 
-    private fun <T : MusicParent> refreshDetail(
+    private inline fun <T : MusicParent> refreshDetail(
         detail: Detail<T>?,
         parent: MutableStateFlow<T?>,
         list: MutableStateFlow<List<Item>>,
         instructions: MutableEvent<UpdateInstructions>,
-        replace: Int?
+        replace: Int?,
+        songHeader: (Int) -> Header = { SortHeader(it) }
     ) {
         if (detail == null) {
             parent.value = null
@@ -541,7 +544,7 @@ constructor(
                 when (section) {
                     is DetailSection.PlainSection<*> -> {
                         val header =
-                            if (section is DetailSection.Songs) SortHeader(section.stringRes)
+                            if (section is DetailSection.Songs) songHeader(section.stringRes)
                             else BasicHeader(section.stringRes)
                         if (newList.isNotEmpty()) {
                             newList.add(Divider(header))
@@ -589,7 +592,9 @@ constructor(
         if (edited == null) {
             val playlist = detailGenerator.playlist(uid)
             refreshDetail(
-                playlist, _currentPlaylist, _playlistSongList, _playlistSongInstructions, null)
+                playlist, _currentPlaylist, _playlistSongList, _playlistSongInstructions, null) {
+                    EditHeader(it)
+                }
             return
         }
         val list = mutableListOf<Item>()
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt
index b5724f6b4..dc33ca4ab 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt
@@ -113,9 +113,9 @@ private constructor(
      */
     fun release() {
         bitmapProvider.release()
+        playbackManager.removeListener(this)
         playbackSettings.unregisterListener(this)
         imageSettings.unregisterListener(this)
-        playbackManager.removeListener(this)
         mediaSession.apply {
             isActive = false
             release()
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt
index 04af2a40f..26ce16237 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt
@@ -107,11 +107,11 @@ private constructor(
 
     fun release() {
         waitJob.cancel()
+        playbackManager.removeListener(this)
+        systemReceiver.release()
         widgetComponent.release()
-        context.unregisterReceiver(systemReceiver)
         sessionHolder.release()
         exoHolder.release()
-        playbackManager.removeListener(this)
     }
 
     override fun onSessionEnded() {
diff --git a/fastlane/metadata/android/en-US/changelogs/51.txt b/fastlane/metadata/android/en-US/changelogs/51.txt
new file mode 100644
index 000000000..131fed628
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/51.txt
@@ -0,0 +1,3 @@
+Auxio 3.6.0 improves support for android auto and fixes several small regressions.
+This release fixes critical issues identified in the previous version.
+For more information, see https://github.com/OxygenCobalt/Auxio/releases/tag/v3.6.0.
\ No newline at end of file