diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/MainActivity.kt b/app/src/main/java/com/greenart7c3/nostrsigner/MainActivity.kt
index 032dd987..3ad891de 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/MainActivity.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/MainActivity.kt
@@ -62,12 +62,23 @@ class MainActivity : AppCompatActivity() {
 
         val intentData = IntentUtils.getIntentData(intent) ?: return
         val list = mutableListOf(intentData)
+        if (mainViewModel.intents.value == null) {
+            mainViewModel.intents.value = mutableListOf()
+        }
         mainViewModel.intents.value?.forEach {
             if (list.none { item -> item.id == it.id }) {
                 list.add(it)
             }
         }
 
-        mainViewModel.intents.value = list
+        list.forEach {
+            val list2 = mainViewModel.intents.value!!
+            if (list2.none { item -> item.id == it.id }) {
+                list2.add(it)
+            }
+        }
+        mainViewModel.intents.value = mainViewModel.intents.value?.map {
+            it
+        }?.toMutableList()
     }
 }
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountScreen.kt
index b59d61c6..550adfa3 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountScreen.kt
@@ -33,8 +33,14 @@ fun AccountScreen(
                     LoginPage(accountStateViewModel)
                 }
                 is AccountState.LoggedIn -> {
+                    val intentData = IntentUtils.getIntentData(intent)
+                    if (intentData != null) {
+                        if (intents.none { item -> item.id == intentData.id }) {
+                            intents.add(intentData)
+                        }
+                    }
+
                     val newIntents = intents.ifEmpty {
-                        val intentData = IntentUtils.getIntentData(intent)
                         if (intentData == null) {
                             listOf()
                         } else {