diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
index 5a471a48c48b..d2eabee3965a 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
@@ -670,9 +670,9 @@ class PreviewImageActivity :
         val showBars = !isActionBarVisible
         toggleActionBarVisibility(showBars)
         if (showBars) {
-            windowInsetsController.show(WindowInsetsCompat.Type.navigationBars())
+            windowInsetsController.show(WindowInsetsCompat.Type.systemBars())
         } else {
-            windowInsetsController.hide(WindowInsetsCompat.Type.navigationBars())
+            windowInsetsController.hide(WindowInsetsCompat.Type.systemBars())
         }
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewPlaybackFragment.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewPlaybackFragment.kt
index bf04c13810c0..3b3028810b7f 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewPlaybackFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewPlaybackFragment.kt
@@ -32,6 +32,7 @@ import com.nextcloud.client.player.model.PlayerThumbnailLoader
 import com.nextcloud.client.player.model.file.PlaybackCollection
 import com.nextcloud.client.player.model.file.PlaybackFile
 import com.nextcloud.client.player.model.state.PlaybackState
+import com.nextcloud.client.player.model.state.PlayerState
 import com.nextcloud.client.player.model.state.VideoSize
 import com.nextcloud.client.player.ui.MediaNavigator
 import com.nextcloud.client.player.util.PlayerUtil.applyVideoSize
@@ -370,6 +371,11 @@ class PreviewPlaybackFragment :
         if (isCurrentItem(state)) {
             wasCurrentItem = true
             showVideo(state?.currentItemState?.videoSize)
+
+            // Keep the screen on while playing. This works because it's called at every playback update and when
+            // the surfaceview is not visible (scrolled away, app in background...)
+            binding.surfaceView.keepScreenOn = state?.currentItemState?.playerState == PlayerState.PLAYING
+
             return
         }