diff --git a/application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesVideo.kt b/application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesVideo.kt
index 1036719c9..23c2d174e 100644
--- a/application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesVideo.kt
+++ b/application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesVideo.kt
@@ -53,7 +53,6 @@ class PreferencesVideo : BasePreferenceFragment(), SharedPreferences.OnSharedPre
         findPreference<Preference>("enable_clone_mode")?.isVisible = false
         findPreference<Preference>(SAVE_BRIGHTNESS)?.isVisible = false
         findPreference<Preference>(POPUP_FORCE_LEGACY)?.isVisible = false
-        findPreference<Preference>(LOCK_USE_SENSOR)?.isVisible = false
     }
 
     override fun onStart() {
diff --git a/application/vlc-android/res/xml/preferences_video.xml b/application/vlc-android/res/xml/preferences_video.xml
index a16fa8542..9ba89a0f3 100644
--- a/application/vlc-android/res/xml/preferences_video.xml
+++ b/application/vlc-android/res/xml/preferences_video.xml
@@ -4,24 +4,12 @@
                                       xmlns:app="http://schemas.android.com/apk/res-auto"
                                       android:key="video_category"
                                       android:title="@string/video_prefs_category">
-    <CheckBoxPreference
-            app:singleLineTitle="false"
-            android:defaultValue="true"
-            android:key="save_individual_audio_delay"
-            android:summary="@string/save_audiodelay_summary"
-            android:title="@string/save_audiodelay_title"/>
     <CheckBoxPreference
             app:singleLineTitle="false"
             android:defaultValue="false"
             android:key="always_fast_seek"
             android:summary="@string/always_fast_seek_summary"
             android:title="@string/always_fast_seek"/>
-    <CheckBoxPreference
-            app:singleLineTitle="false"
-            android:defaultValue="true"
-            android:key="video_transition_show"
-            android:summary="@string/video_transition_summary"
-            android:title="@string/video_transition_title"/>
 
     <CheckBoxPreference
             app:singleLineTitle="false"
@@ -51,21 +39,7 @@
                 android:key="preferred_resolution"
                 android:summary="@string/preferred_resolution_summary"
                 android:title="@string/preferred_resolution"/>
-    <ListPreference
-            app:singleLineTitle="false"
-            android:defaultValue="0"
-            android:key="video_confirm_resume"
-            android:entries="@array/ask_confirmation_entries"
-            android:entryValues="@array/ask_confirmation_values"
-            android:summary="%s"
-            android:title="@string/confirm_resume_title"/>
 
-    <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="lock_use_sensor"
-            android:summary="@string/lock_use_sensor_summary"
-            android:title="@string/lock_use_sensor_title"
-            app:singleLineTitle="false" />
 
     <PreferenceCategory
             android:title="@string/interface_secondary_display_category_title"
diff --git a/application/vlc-android/res/xml/preferences_video_controls.xml b/application/vlc-android/res/xml/preferences_video_controls.xml
index 3f2e0edd4..c76a3aac1 100644
--- a/application/vlc-android/res/xml/preferences_video_controls.xml
+++ b/application/vlc-android/res/xml/preferences_video_controls.xml
@@ -13,6 +13,24 @@
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 
+    <CheckBoxPreference
+            app:singleLineTitle="false"
+            android:defaultValue="true"
+            android:key="save_individual_audio_delay"
+            app:iconSpaceReserved="false"
+            android:summary="@string/save_audiodelay_summary"
+            android:title="@string/save_audiodelay_title"/>
+
+    <ListPreference
+            app:singleLineTitle="false"
+            android:defaultValue="0"
+            android:key="video_confirm_resume"
+            app:iconSpaceReserved="false"
+            android:entries="@array/ask_confirmation_entries"
+            android:entryValues="@array/ask_confirmation_values"
+            android:summary="%s"
+            android:title="@string/confirm_resume_title"/>
+
     <PreferenceCategory android:title="@string/gestures"
             app:iconSpaceReserved="false">
         <CheckBoxPreference
@@ -144,6 +162,22 @@
                 app:seekBarIncrement="1"
                 app:singleLineTitle="false"
                 app:updatesContinuously="true" />
+
+        <CheckBoxPreference
+                app:singleLineTitle="false"
+                android:defaultValue="true"
+                android:key="video_transition_show"
+                app:iconSpaceReserved="false"
+                android:summary="@string/video_transition_summary"
+                android:title="@string/video_transition_title"/>
+
+        <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="lock_use_sensor"
+                app:iconSpaceReserved="false"
+                android:summary="@string/lock_use_sensor_summary"
+                android:title="@string/lock_use_sensor_title"
+                app:singleLineTitle="false" />
     </PreferenceCategory>
 
 
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideoControls.kt b/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideoControls.kt
index 97dc53391..1be6d616d 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideoControls.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideoControls.kt
@@ -42,12 +42,14 @@ import org.videolan.tools.FASTPLAY_SPEED
 import org.videolan.tools.KEY_VIDEO_DOUBLE_TAP_JUMP_DELAY
 import org.videolan.tools.KEY_VIDEO_JUMP_DELAY
 import org.videolan.tools.KEY_VIDEO_LONG_JUMP_DELAY
+import org.videolan.tools.LOCK_USE_SENSOR
 import org.videolan.tools.POPUP_KEEPSCREEN
 import org.videolan.tools.SCREENSHOT_MODE
 import org.videolan.tools.Settings
 import org.videolan.tools.VIDEO_HUD_TIMEOUT
 import org.videolan.tools.coerceInOrDefault
 import org.videolan.vlc.R
+import org.videolan.vlc.gui.helpers.UiTools
 import org.videolan.vlc.gui.video.VideoPlayerActivity
 
 class PreferencesVideoControls : BasePreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener  {
@@ -73,6 +75,8 @@ class PreferencesVideoControls : BasePreferenceFragment(), SharedPreferences.OnS
         findPreference<Preference>(ENABLE_BRIGHTNESS_GESTURE)?.isVisible = AndroidDevices.hasTsp
         findPreference<Preference>(POPUP_KEEPSCREEN)?.isVisible = !AndroidDevices.isAndroidTv && !AndroidUtil.isOOrLater
         findPreference<Preference>(KEY_VIDEO_DOUBLE_TAP_JUMP_DELAY)?.title = getString(if (AndroidDevices.isAndroidTv) R.string.video_key_jump_delay else R.string.video_double_tap_jump_delay)
+        findPreference<Preference>(LOCK_USE_SENSOR)?.isVisible = !AndroidDevices.isAndroidTv
+
         updateHudTimeoutSummary()
         val audiomanager = requireActivity().getSystemService<AudioManager>()!!
         if (audiomanager.isVolumeFixed) {