diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt
index bc9dcbcee3..6828ecf2f2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt
@@ -61,7 +61,7 @@ abstract class BaseController(bundle: Bundle? = null) :
     open fun onViewCreated(view: View) { }
 
     override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {
-        if (type.isEnter) {
+        if (type.isEnter && !isControllerVisible) {
             view?.alpha = 0f
         } else {
             removeQueryListener()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/DialogController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/DialogController.kt
index ed89e1e27d..432b669e38 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/DialogController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/DialogController.kt
@@ -99,13 +99,7 @@ abstract class DialogController : Controller {
         if (dismissed) {
             return
         }
-        val prev = this.previousController
         router.popController(this)
-        // FIXME: This is a hack so that previous controller stays visible
-        prev?.let {
-            if (it !is BaseController) return@let
-            it.view?.alpha = 1.0f
-        }
         dismissed = true
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt
index 329bb811eb..329c0661bd 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt
@@ -57,6 +57,7 @@ import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.MainActivityBinding
 import eu.kanade.tachiyomi.ui.base.SmallToolbarInterface
+import eu.kanade.tachiyomi.ui.base.controller.BaseController
 import eu.kanade.tachiyomi.ui.base.controller.BaseLegacyController
 import eu.kanade.tachiyomi.ui.base.controller.CrossFadeChangeHandler
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
@@ -903,7 +904,7 @@ val Controller.previousController: Controller?
 @MainThread
 fun Router.canStillGoBack(): Boolean {
     if (backstack.size > 1) return true
-    (backstack.lastOrNull()?.controller as? BaseLegacyController<*>)?.let { controller ->
+    (backstack.lastOrNull()?.controller as? BaseController)?.let { controller ->
         return controller.canStillGoBack()
     }
     return false