diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt
index ba723e53d..30bf505d7 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt
@@ -218,7 +218,7 @@ fun UpdateZapAmountDialog(onClose: () -> Unit, nip47uri: String? = null, account
     val zapOptions = remember { zapTypes.map { it.second }.toImmutableList() }
     val zapOptionExplainers = remember { zapTypes.map { it.third }.toImmutableList() }
 
-    LaunchedEffect(accountViewModel) {
+    LaunchedEffect(accountViewModel, nip47uri) {
         postViewModel.load()
         if (nip47uri != null) {
             try {
@@ -384,6 +384,7 @@ fun UpdateZapAmountDialog(onClose: () -> Unit, nip47uri: String? = null, account
                             )
 
                             IconButton(onClick = {
+                                onClose()
                                 runCatching { uri.openUri("https://nwc.getalby.com/apps/new?c=Amethyst") }
                             }) {
                                 Icon(
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
index 435a0cd76..73732e409 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
@@ -54,7 +54,7 @@ fun HomeScreen(
     nav: (String) -> Unit,
     nip47: String? = null
 ) {
-    var wantsToAddNip47 by remember { mutableStateOf(nip47) }
+    var wantsToAddNip47 by remember(nip47) { mutableStateOf(nip47) }
 
     val pagerState = rememberForeverPagerState(key = PagerStateKeys.HOME_SCREEN)