diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
index 0ea38edd4..9c7ae6135 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
@@ -344,11 +344,11 @@ private fun NavigateIfIntentRequested(
 
     val scope = rememberCoroutineScope()
 
-    DisposableEffect(activity) {
+    DisposableEffect(nav, activity) {
         val consumer =
             Consumer<Intent> { intent ->
-                val uri = intent?.data?.toString()
-                if (!uri.isNullOrBlank()) {
+                val uri = intent.data.toString()
+                if (uri.isNotBlank()) {
                     // navigation functions
                     val newPage = uriToRoute(uri)
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/INav.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/INav.kt
index 0309b1d9b..aa04022e2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/INav.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/INav.kt
@@ -111,7 +111,7 @@ class Nav(
         upTo: String,
     ) {
         scope.launch {
-            controller.navigate(route) { popUpTo(route) { inclusive = true } }
+            controller.navigate(route) { popUpTo(upTo) { inclusive = true } }
         }
     }
 }