diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4fd3a8d4a..a72b3181e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -160,6 +160,7 @@ android {
 
 dependencies {
     implementation(libs.androidx.annotations)
+    implementation(libs.androidx.activity)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.constraint.layout)
     implementation(libs.androidx.core.ktx)
diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
index c5a7323ee..c0cf4fd54 100644
--- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
@@ -480,7 +480,10 @@ class MainActivity : GenericActivity() {
                                 )
                             } else {
                                 val navOptionsBuilder = NavOptions.Builder()
-                                navOptionsBuilder.setPopUpTo(R.id.historyListFragment, true)
+                                navOptionsBuilder.setPopUpTo(
+                                    findNavController().currentDestination?.id ?: R.id.historyListFragment,
+                                    true
+                                )
                                 navOptionsBuilder.setLaunchSingleTop(true)
                                 val navOptions = navOptionsBuilder.build()
                                 findNavController().navigate(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b6963bc6a..33f808a9c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,6 +7,7 @@ firebaseBomVersion = "33.0.0"
 ktlint = "11.3.1"
 
 annotations = "1.8.0"
+activity = "1.9.0"
 appcompat = "1.7.0-rc01"
 constraintLayout = "2.1.4"
 coreKtx = "1.13.1"
@@ -31,6 +32,7 @@ linphone = "5.4.+"
 
 [libraries]
 androidx-annotations = { group = "androidx.annotation", name = "annotation", version.ref = "annotations" }
+androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 androidx-constraint-layout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintLayout" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }