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 bcee38708..c80636795 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -1629,6 +1629,13 @@ class PlayerFragment : BaseFragment() {
     }
 
     private fun shouldStartPiP(): Boolean {
+        val pipEnabled = PreferenceHelper.getBoolean(
+            PreferenceKeys.PICTURE_IN_PICTURE,
+            true
+        )
+
+        if (!pipEnabled) return false
+
         val bounds = Rect()
         binding.playerScrollView.getHitRect(bounds)
 
diff --git a/app/src/main/java/com/github/libretube/preferences/PreferenceKeys.kt b/app/src/main/java/com/github/libretube/preferences/PreferenceKeys.kt
index 4074128fd..c8e087461 100644
--- a/app/src/main/java/com/github/libretube/preferences/PreferenceKeys.kt
+++ b/app/src/main/java/com/github/libretube/preferences/PreferenceKeys.kt
@@ -59,6 +59,7 @@ object PreferenceKeys {
     const val PLAYER_AUDIO_QUALITY = "player_audio_quality"
     const val DEFAULT_SUBTITLE = "default_subtitle"
     const val SKIP_BUTTONS = "skip_buttons"
+    const val PICTURE_IN_PICTURE = "picture_in_picture"
 
     /**
      * Background mode
diff --git a/app/src/main/res/drawable/ic_window.xml b/app/src/main/res/drawable/ic_window.xml
new file mode 100644
index 000000000..e58d327cd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_window.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,3H4C2.9,3 2,3.9 2,5v10c0,1.1 0.9,2 2,2h6v2H8v2h8v-2h-2v-2h6c1.1,0 2,-0.9 2,-2V5C22,3.9 21.1,3 20,3" />
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6f3ccd18c..5a4bee15d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -312,4 +312,5 @@
     <string name="repeat_mode_current">Current</string>
     <string name="backup_restore">Backup &amp; restore</string>
     <string name="backup">Backup</string>
+    <string name="picture_in_picture">Picture in Picture</string>
 </resources>
diff --git a/app/src/main/res/xml/player_settings.xml b/app/src/main/res/xml/player_settings.xml
index b3b646ed0..660f19e37 100644
--- a/app/src/main/res/xml/player_settings.xml
+++ b/app/src/main/res/xml/player_settings.xml
@@ -46,7 +46,7 @@
 
         <ListPreference
             android:icon="@drawable/ic_speed"
-            app:defaultValue="1"
+            app:defaultValue="1.0"
             app:entries="@array/playbackSpeed"
             app:entryValues="@array/playbackSpeedValues"
             app:key="playback_speed"
@@ -95,6 +95,12 @@
             app:key="autoplay"
             app:title="@string/player_autoplay" />
 
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:icon="@drawable/ic_window"
+            app:key="picture_in_picture"
+            app:title="@string/picture_in_picture" />
+
         <SwitchPreferenceCompat
             android:icon="@drawable/ic_pause_filled"
             android:summary="@string/pauseOnScreenOff_summary"
@@ -124,7 +130,7 @@
 
         <ListPreference
             android:icon="@drawable/ic_speed"
-            app:defaultValue="1"
+            app:defaultValue="1.0"
             app:entries="@array/playbackSpeed"
             app:entryValues="@array/playbackSpeedValues"
             app:key="background_playback_speed"