diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cea8ebccb4..ebe412da85 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/StartupTheme"
-        tools:targetApi="n">
+        android:enableOnBackInvokedCallback="true"
+        tools:targetApi="tiramisu">
 
         <activity
             android:name=".ui.activities.WelcomeActivity"
diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
index 00520d6e02..159df4d3bb 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
@@ -136,10 +136,10 @@ class MainActivity : BaseActivity() {
 
         setupSubscriptionsBadge()
 
-        // new way of handling back presses
         onBackPressedDispatcher.addCallback {
             if (playerViewModel.isFullscreen.value == true) {
-                runOnPlayerFragment { unsetFullscreen() }
+                val fullscreenUnsetSuccess = runOnPlayerFragment { unsetFullscreen() }
+                if (fullscreenUnsetSuccess) return@addCallback
             }
 
             if (binding.mainMotionLayout.progress == 0F) {
@@ -497,12 +497,19 @@ class MainActivity : BaseActivity() {
     }
 
     override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
-        return runOnPlayerFragment { onKeyUp(keyCode, event) } ?: false
+        return runOnPlayerFragment { onKeyUp(keyCode, event) }
     }
 
-    private fun <T> runOnPlayerFragment(action: PlayerFragment.() -> T): T? {
-        return supportFragmentManager.fragments.filterIsInstance<PlayerFragment>()
+    /**
+     * Attempt to run code on the player fragment if running
+     * Returns true if a running player fragment was found and the action got consumed, else false
+     */
+    private fun runOnPlayerFragment(action: PlayerFragment.() -> Unit): Boolean {
+        supportFragmentManager.fragments.filterIsInstance<PlayerFragment>()
             .firstOrNull()
             ?.let(action)
+            ?.run { return true }
+
+        return false
     }
 }
diff --git a/app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt b/app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt
index b842b3e774..c1e4e98f57 100644
--- a/app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt
@@ -52,7 +52,7 @@ open class BaseActivity : AppCompatActivity() {
     }
 
     /**
-     * Rotate according to the preference
+     * Rotate the screen according to the app orientation preference
      */
     fun requestOrientationChange() {
         requestedOrientation = screenOrientationPref
diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
index 10044f453d..7b63c64687 100644
--- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
@@ -24,7 +24,6 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.marginStart
 import androidx.core.view.updateLayoutParams
-import androidx.fragment.app.commit
 import androidx.media3.common.C
 import androidx.media3.common.Player
 import androidx.media3.common.text.Cue