diff --git a/app/src/main/java/com/github/libretube/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/activities/MainActivity.kt
index d887e1121..4341b30f3 100644
--- a/app/src/main/java/com/github/libretube/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/activities/MainActivity.kt
@@ -21,6 +21,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.os.bundleOf
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
@@ -259,10 +260,15 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onBackPressed() {
-        if (binding.mainMotionLayout.progress == 0F) {
-            try { minimizePlayer() } catch (e: Exception) {}
+        if (
+            binding.mainMotionLayout.progress == 0F
+        ) {
+            try {
+                minimizePlayer()
+            } catch (e: Exception) {
+                super.onBackPressed()
+            }
         } else if (navController.currentDestination?.id == startFragmentId) {
-            navController.popBackStack()
             super.onBackPressed()
         } else {
             navController.popBackStack()
diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index b211e483c..4d1f19f87 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -955,7 +955,7 @@ class PlayerFragment : Fragment() {
             }
         }
 
-        playerBinding.qualitySelect.setOnClickListener {
+        playerBinding.qualityLinLayout.setOnClickListener {
             // Dialog for quality selection
             val builder: MaterialAlertDialogBuilder? = activity?.let {
                 MaterialAlertDialogBuilder(it)