diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index fba5ce7b2..873b4acbb 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -124,11 +124,7 @@ open class HomeActivity : AppCompatActivity() { val host = supportFragmentManager.findFragmentById(R.id.container) as NavHostFragment val directions = when (from) { - BrowserDirection.FromGlobal -> { - NavGraphDirections.actionGlobalBrowser(sessionId).apply { - host.navController.popBackStack() - } - } + BrowserDirection.FromGlobal -> NavGraphDirections.actionGlobalBrowser(sessionId) BrowserDirection.FromHome -> HomeFragmentDirections.actionHomeFragmentToBrowserFragment(sessionId) BrowserDirection.FromSearch -> SearchFragmentDirections.actionSearchFragmentToBrowserFragment(sessionId) BrowserDirection.FromSettings -> diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 1234878cb..6418f0922 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -7,7 +7,9 @@ + app:destination="@id/browserFragment" + app:popUpTo="@id/nav_graph" + app:popUpToInclusive="true" />