diff --git a/Shared/Player/PlayerDragGesture.swift b/Shared/Player/PlayerDragGesture.swift
index 5a5f40a8..82add343 100644
--- a/Shared/Player/PlayerDragGesture.swift
+++ b/Shared/Player/PlayerDragGesture.swift
@@ -17,7 +17,8 @@ extension VideoPlayerView {
             }
             .onChanged { value in
                 guard player.presentingPlayer,
-                      !controlsOverlayModel.presenting else { return }
+                      !controlsOverlayModel.presenting,
+                      dragGestureState else { return }
 
                 if player.controls.presentingControls, !player.musicMode {
                     player.controls.presentingControls = false
diff --git a/Shared/Player/VideoPlayerView.swift b/Shared/Player/VideoPlayerView.swift
index 52d0b925..c125761a 100644
--- a/Shared/Player/VideoPlayerView.swift
+++ b/Shared/Player/VideoPlayerView.swift
@@ -236,7 +236,15 @@ struct VideoPlayerView: View {
         }
 
         var playerOffset: Double {
-            dragGestureState && !isHorizontalDrag ? dragGestureOffset.height : viewDragOffset
+            dragGestureState && !isHorizontalDrag ? dragGestureOffset.height : dragOffset
+        }
+
+        var dragOffset: Double {
+            if viewDragOffset.isZero || viewDragOffset == Self.hiddenOffset {
+                return viewDragOffset
+            }
+
+            return player.presentingPlayer ? 0 : Self.hiddenOffset
         }
 
         var playerHeight: Double? {