diff --git a/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt
index 674b73f54..c19cbe9b1 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt
@@ -17,6 +17,7 @@ import com.github.libretube.constants.IntentData
 import com.github.libretube.databinding.ActivityOfflinePlayerBinding
 import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding
 import com.github.libretube.ui.base.BaseActivity
+import com.github.libretube.ui.extensions.setAspectRatio
 import com.github.libretube.ui.models.PlayerViewModel
 import com.github.libretube.util.DownloadHelper
 import com.github.libretube.util.PlayerHelper
@@ -182,6 +183,7 @@ class OfflinePlayerActivity : BaseActivity() {
         enterPictureInPictureMode(
             PictureInPictureParams.Builder()
                 .setActions(emptyList())
+                .setAspectRatio(player.videoSize.width, player.videoSize.height)
                 .build()
         )
 
diff --git a/app/src/main/java/com/github/libretube/util/PlayerGestureController.kt b/app/src/main/java/com/github/libretube/util/PlayerGestureController.kt
index 7ae046ef8..57a294bbb 100644
--- a/app/src/main/java/com/github/libretube/util/PlayerGestureController.kt
+++ b/app/src/main/java/com/github/libretube/util/PlayerGestureController.kt
@@ -18,15 +18,18 @@ import kotlin.math.abs
 class PlayerGestureController(activity: BaseActivity, private val listener: PlayerGestureOptions) :
     View.OnTouchListener {
 
-    // width and height should be obtained each time using getter to adopt layout size changes.
+    // width and height should be obtained each time using getter to adopt layout
+    // size changes.
     private val width get() = Resources.getSystem().displayMetrics.widthPixels
     private val height get() = Resources.getSystem().displayMetrics.heightPixels
     private val elapsedTime get() = SystemClock.elapsedRealtime()
-    private val playerViewModel: PlayerViewModel by activity.viewModels()
 
+    private val playerViewModel: PlayerViewModel by activity.viewModels()
     private val handler: Handler = Handler(Looper.getMainLooper())
+
     private val gestureDetector: GestureDetector
     private val scaleGestureDetector: ScaleGestureDetector
+
     private var isFullscreen = false
     private var isMoving = false
     var isEnabled = true
@@ -54,7 +57,8 @@ class PlayerGestureController(activity: BaseActivity, private val listener: Play
             gestureDetector.onTouchEvent(event)
         } catch (_: Exception) { }
 
-        // If video is playing in full-screen then allow `onScroll` to consume event and return true.
+        // If video is playing in full-screen mode, then allow `onScroll` to consume
+        // event and return true.
         return isFullscreen
     }