diff --git a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/Main.kt b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/Main.kt
index 59ef6d07c..1b665d88e 100644
--- a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/Main.kt
+++ b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/Main.kt
@@ -672,6 +672,10 @@ fun App(
             }
             val result = accountManager.loadSavedAccount()
             if (result.isSuccess) {
+                // Ensure loaded account is in multi-account storage
+                accountManager.ensureCurrentAccountInStorage()
+                accountManager.refreshAccountList()
+
                 val current = accountManager.currentAccount()
                 if (current?.signerType is com.vitorpamplona.amethyst.commons.model.account.SignerType.Remote) {
                     accountManager.startHeartbeat(scope)