diff --git a/src/main/java/de/bixilon/minosoft/config/profile/storage/ProfileIOUtil.kt b/src/main/java/de/bixilon/minosoft/config/profile/ProfileUtil.kt
similarity index 92%
rename from src/main/java/de/bixilon/minosoft/config/profile/storage/ProfileIOUtil.kt
rename to src/main/java/de/bixilon/minosoft/config/profile/ProfileUtil.kt
index a7fa62e50..81531cb70 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/storage/ProfileIOUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/ProfileUtil.kt
@@ -11,9 +11,9 @@
  * This software is not affiliated with Mojang AB, the original developer of Minecraft.
  */
 
-package de.bixilon.minosoft.config.profile.storage
+package de.bixilon.minosoft.config.profile
 
-object ProfileIOUtil {
+object ProfileUtil {
     val NAME_REGEX = "[\\w_ ]{1,32}".toRegex()
 
     fun String.isValidName(): Boolean {
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/storage/ProfileIOManager.kt b/src/main/java/de/bixilon/minosoft/config/profile/storage/ProfileIOManager.kt
index 697777980..4922760c1 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/storage/ProfileIOManager.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/storage/ProfileIOManager.kt
@@ -31,6 +31,7 @@ object ProfileIOManager {
     private val save: MutableSet<FileStorage> = mutableSetOf()
     private val delete: MutableSet<FileStorage> = mutableSetOf()
     private val reload: MutableSet<FileStorage> = mutableSetOf()
+    private val selected: MutableSet<StorageProfileManager<*>> = mutableSetOf()
 
 
     fun init() {
@@ -93,6 +94,16 @@ object ProfileIOManager {
         }
     }
 
+    private fun selected() {
+        if (selected.isEmpty()) return
+        val iterator = selected.iterator()
+        while (iterator.hasNext()) {
+            val manager = iterator.next()
+            iterator.remove()
+            ignoreAll { manager.saveSelected() }
+        }
+    }
+
 
     fun save(storage: FileStorage) {
         lock.lock()
@@ -114,4 +125,11 @@ object ProfileIOManager {
         lock.unlock()
         notify.countUp()
     }
+
+    fun saveSelected(manager: StorageProfileManager<*>) {
+        lock.lock()
+        selected += manager
+        lock.unlock()
+        notify.countUp()
+    }
 }
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/storage/StorageProfileManager.kt b/src/main/java/de/bixilon/minosoft/config/profile/storage/StorageProfileManager.kt
index b098dee8f..ee7ce96cc 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/storage/StorageProfileManager.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/storage/StorageProfileManager.kt
@@ -21,7 +21,6 @@ import de.bixilon.kutil.cast.CastUtil.unsafeNull
 import de.bixilon.kutil.collections.CollectionUtil.mutableBiMapOf
 import de.bixilon.kutil.collections.map.bi.AbstractMutableBiMap
 import de.bixilon.kutil.concurrent.lock.simple.SimpleLock
-import de.bixilon.kutil.concurrent.pool.DefaultThreadPool
 import de.bixilon.kutil.exception.Broken
 import de.bixilon.kutil.file.watcher.FileWatcherService
 import de.bixilon.kutil.observer.DataObserver.Companion.observe
@@ -30,8 +29,8 @@ import de.bixilon.kutil.observer.map.bi.BiMapObserver.Companion.observedBiMap
 import de.bixilon.minosoft.assets.util.FileUtil.mkdirParent
 import de.bixilon.minosoft.assets.util.InputStreamUtil.readAsString
 import de.bixilon.minosoft.config.profile.ProfileType
+import de.bixilon.minosoft.config.profile.ProfileUtil.isValidName
 import de.bixilon.minosoft.config.profile.profiles.Profile
-import de.bixilon.minosoft.config.profile.storage.ProfileIOUtil.isValidName
 import de.bixilon.minosoft.data.registries.identified.Identified
 import de.bixilon.minosoft.gui.eros.crash.ErosCrashReport.Companion.crash
 import de.bixilon.minosoft.protocol.ProtocolUtil.encodeNetwork
@@ -52,6 +51,7 @@ abstract class StorageProfileManager<P : Profile> : Iterable<P>, Identified {
     private val jacksonType by lazy { Jackson.MAPPER.typeFactory.constructType(type.clazz) }
     private val reader by lazy { Jackson.MAPPER.readerFor(jacksonType) }
     override val identifier get() = type.identifier
+    private lateinit var root: File
 
 
     abstract val latestVersion: Int
@@ -100,16 +100,18 @@ abstract class StorageProfileManager<P : Profile> : Iterable<P>, Identified {
         return stream.readAsString()
     }
 
-    private fun saveSelected(root: File, name: String) {
+    fun saveSelected(name: String? = this.selected.storage?.nullCast<FileStorage>()?.name) {
         val file = root.resolve(SELECTED)
         file.mkdirParent()
         val stream = FileOutputStream(file)
-        stream.write(name.encodeNetwork())
+        if (name != null) {
+            stream.write(name.encodeNetwork())
+        }
         stream.close()
     }
 
     open fun load() {
-        val root = RunConfiguration.CONFIG_DIRECTORY.resolve(identifier.namespace).resolve(identifier.path).toFile()
+        root = RunConfiguration.CONFIG_DIRECTORY.resolve(identifier.namespace).resolve(identifier.path).toFile()
         if (!root.exists()) {
             root.mkdirs()
             return createDefault()
@@ -117,7 +119,7 @@ abstract class StorageProfileManager<P : Profile> : Iterable<P>, Identified {
         var selected = loadSelected(root)
         if (selected == null) {
             selected = DEFAULT_NAME
-            saveSelected(root, selected)
+            saveSelected(selected)
         }
         if (!selected.isValidName()) selected = DEFAULT_NAME
         val files = root.listFiles() ?: return createDefault()
@@ -142,14 +144,7 @@ abstract class StorageProfileManager<P : Profile> : Iterable<P>, Identified {
         }
 
         this.selected = this[selected] ?: create(selected)
-        this::selected.observe(this) {
-            val name = it.storage.unsafeCast<FileStorage>().name
-            DefaultThreadPool += {
-                this.lock.acquire()
-                saveSelected(root, name)
-                this.lock.release()
-            }
-        }
+        this::selected.observe(this) { ProfileIOManager.saveSelected(this) }
 
         observe(root.toPath())
     }