diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index ff26bdb3b..abd0754ce 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -979,7 +979,7 @@ internal fun CallActivity.navigateToOutgoingCall() {
     findNavController(R.id.nav_host_fragment).navigate(
         R.id.action_global_outgoingCallFragment,
         null,
-        popupTo(R.id.singleCallFragment, false)
+        popupTo(R.id.singleCallFragment, true)
     )
 }
 
@@ -989,7 +989,7 @@ internal fun CallActivity.navigateToIncomingCall(earlyMediaVideoEnabled: Boolean
     findNavController(R.id.nav_host_fragment).navigate(
         R.id.action_global_incomingCallFragment,
         args,
-        popupTo(R.id.singleCallFragment, false)
+        popupTo(R.id.singleCallFragment, true)
     )
 }
 
@@ -997,7 +997,7 @@ internal fun OutgoingCallFragment.navigateToActiveCall() {
     findNavController().navigate(
         R.id.action_global_singleCallFragment,
         null,
-        popupTo(R.id.singleCallFragment, false)
+        popupTo(R.id.outgoingCallFragment, true)
     )
 }
 
@@ -1005,7 +1005,7 @@ internal fun IncomingCallFragment.navigateToActiveCall() {
     findNavController().navigate(
         R.id.action_global_singleCallFragment,
         null,
-        popupTo(R.id.singleCallFragment, false)
+        popupTo(R.id.incomingCallFragment, true)
     )
 }
 
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt
index 8e29abe36..a172eb143 100644
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt
+++ b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt
@@ -20,7 +20,6 @@
 package org.linphone.activities.voip.fragments
 
 import android.annotation.SuppressLint
-import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
 import android.os.SystemClock
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/SingleCallFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/SingleCallFragment.kt
index f98648301..8bbb3eaa0 100644
--- a/app/src/main/java/org/linphone/activities/voip/fragments/SingleCallFragment.kt
+++ b/app/src/main/java/org/linphone/activities/voip/fragments/SingleCallFragment.kt
@@ -30,7 +30,6 @@ import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.navigation.navGraphViewModels
 import androidx.window.layout.FoldingFeature
-import com.google.android.material.snackbar.Snackbar
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.R
 import org.linphone.activities.*