diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index b1092ff0d6..01287ed958 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -189,6 +189,7 @@ class MainActivity : BaseActivity() {
 
         val container: ViewGroup = binding.controllerContainer
         router = Conductor.attachRouter(this, container, savedInstanceState)
+            .setPopRootControllerMode(Router.PopRootControllerMode.NEVER)
         router.addChangeListener(
             object : ControllerChangeHandler.ControllerChangeListener {
                 override fun onChangeStarted(
diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml
index c741b576cd..d88718cfbb 100644
--- a/gradle/androidx.versions.toml
+++ b/gradle/androidx.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-agp_version = "7.1.3"
-lifecycle_version = "2.5.0-alpha06"
+agp_version = "7.2.0"
+lifecycle_version = "2.5.0-rc01"
 
 [libraries]
 annotation = "androidx.annotation:annotation:1.4.0-alpha02"
@@ -8,7 +8,7 @@ appcompat = "androidx.appcompat:appcompat:1.4.1"
 biometricktx = "androidx.biometric:biometric-ktx:1.2.0-alpha04"
 constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.3"
 coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-corektx = "androidx.core:core-ktx:1.8.0-beta01"
+corektx = "androidx.core:core-ktx:1.8.0-rc01"
 splashscreen = "androidx.core:core-splashscreen:1.0.0-alpha02"
 recyclerview = "androidx.recyclerview:recyclerview:1.3.0-alpha02"
 swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3ba5133c42..b462a73808 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ aboutlib_version = "10.1.0"
 okhttp_version = "4.9.3"
 nucleus_version = "3.0.0"
 coil_version = "2.0.0"
-conductor_version = "3.1.2"
+conductor_version = "3.1.4"
 flowbinding_version = "1.2.0"
 shizuku_version = "12.1.0"
 sqldelight = "1.5.3"