diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
index 0427ebed7..d874ff11c 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -1492,11 +1492,6 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
             binding.player.hideController()
             binding.player.useController = false
 
-            if (viewModel.isMiniPlayerVisible.value == true) {
-                binding.playerMotionLayout.transitionToStart()
-                viewModel.isMiniPlayerVisible.value = false
-            }
-
             updateCurrentSubtitle(null)
 
             openOrCloseFullscreenDialog(true)
@@ -1510,11 +1505,10 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
 
             updateCurrentSubtitle(currentSubtitle)
 
-            binding.optionsLL.post {
-                binding.optionsLL.requestLayout()
+            // unset fullscreen if it's not been enabled before the start of PiP
+            if (viewModel.isFullscreen.value != true) {
+                openOrCloseFullscreenDialog(false)
             }
-
-            openOrCloseFullscreenDialog(false)
         }
     }
 
diff --git a/app/src/main/java/com/github/libretube/ui/views/OnlinePlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/OnlinePlayerView.kt
index ad4290528..3d4c39824 100644
--- a/app/src/main/java/com/github/libretube/ui/views/OnlinePlayerView.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/OnlinePlayerView.kt
@@ -181,7 +181,7 @@ class OnlinePlayerView(
         super.hideController()
 
         if (playerViewModel?.isFullscreen?.value == true) {
-            toggleSystemBars(true)
+            toggleSystemBars(false)
         }
         updateTopBarMargin()
     }