diff --git a/app/src/main/res/xml/player_settings.xml b/app/src/main/res/xml/player_settings.xml
index 6a330673e..170221875 100644
--- a/app/src/main/res/xml/player_settings.xml
+++ b/app/src/main/res/xml/player_settings.xml
@@ -52,12 +52,12 @@
             app:title="@string/skip_buttons" />
 
         <ListPreference
-            android:defaultValue="true"
+            android:defaultValue="pip"
             android:icon="@drawable/ic_window"
-            app:key="behavior_when_minimized"
-            app:title="@string/behavior_when_minimized"
             app:entries="@array/onMinimize"
             app:entryValues="@array/onMinimizeValues"
+            app:key="behavior_when_minimized"
+            app:title="@string/behavior_when_minimized"
             app:useSimpleSummaryProvider="true" />
 
         <SwitchPreferenceCompat
@@ -96,10 +96,10 @@
 
         <SwitchPreferenceCompat
             android:icon="@drawable/ic_caption"
+            android:summary="@string/rich_caption_rendering_summary"
             app:defaultValue="false"
             app:key="rich_caption_rendering"
-            app:title="@string/rich_caption_rendering"
-            android:summary="@string/rich_caption_rendering_summary"/>
+            app:title="@string/rich_caption_rendering" />
 
         <com.github.libretube.ui.views.SliderPreference
             android:icon="@drawable/ic_text"
@@ -163,8 +163,8 @@
             android:icon="@drawable/ic_headphones"
             android:summaryOff="@string/disabled"
             android:summaryOn="@string/enabled"
-            app:disableDependentsState="true"
             app:defaultValue="true"
+            app:disableDependentsState="true"
             app:key="remember_playback_speed"
             app:title="@string/remember_playback_speed" />