diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
index fe0b30c2a..e5f960008 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
@@ -66,9 +66,10 @@ class SignOutFragment : AppCompatDialogFragment() {
                 accountManager.logout()
             }.invokeOnCompletion {
                 runIfFragmentIsAttached {
-                    if (!findNavController().popBackStack(R.id.settingsFragment, false)) {
+                    if (this.isVisible) {
                         dismiss()
                     }
+                    findNavController().popBackStack()
                 }
             }
         }