diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index f4796dbd4..635423295 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -469,6 +469,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
 
             sessionManager.register(observer = object : SessionManager.Observer {
                 override fun onSessionSelected(session: Session) {
+                    fullScreenChanged(false)
                     browserToolbarView.expand()
                 }
             }, owner = viewLifecycleOwner)
@@ -577,6 +578,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
         super.onPause()
         // If we didn't enter PiP, exit full screen on pause
         if (!enteredPip) {
+            fullScreenChanged(false)
             fullScreenFeature.onBackPressed()
         }
         enteredPip = false