diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt
index 97fad283..3151d49a 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt
@@ -308,7 +308,10 @@ private fun Calls(
                                 positiveAction.value = {
                                     if (ua != null) {
                                         handleIntent(ctx, viewModel, intent, "call")
-                                        navController.popBackStack()
+                                        navController.navigate("main") {
+                                            popUpTo("main")
+                                            launchSingleTop = true
+                                        }
                                     }
                                 }
                                 neutralButtonText.value = ctx.getString(R.string.send_message)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactsScreen.kt
index 15c4ef6f..dbaa9be3 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactsScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactsScreen.kt
@@ -242,7 +242,10 @@ private fun ContactsContent(
                                         positiveAction.value = {
                                             if (ua != null) {
                                                 handleIntent(ctx, viewModel, intent, "call")
-                                                navController.popBackStack()
+                                                navController.navigate("main") {
+                                                    popUpTo("main")
+                                                    launchSingleTop = true
+                                                }
                                             }
                                         }
                                         neutralText.value = ctx.getString(R.string.send_message)