diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/BottomSheet.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/BottomSheet.kt
index 7007cc9..f92dc5d 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/BottomSheet.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/BottomSheet.kt
@@ -76,6 +76,10 @@ fun BottomSheet(
                         velocityTracker.addPointerInputChange(change)
                         state.dispatchRawDelta(dragAmount)
                     },
+                    onDragCancel = {
+                        velocityTracker.resetTracking()
+                        state.snapTo(initialValue)
+                    },
                     onDragEnd = {
                         val velocity = velocityTracker.calculateVelocity().y.absoluteValue
                         velocityTracker.resetTracking()
@@ -149,7 +153,7 @@ class BottomSheetState(
         1f - (animatable.upperBound!! - animatable.value) / (animatable.upperBound!! - animatable.lowerBound!!)
     }
 
-    fun collapse(animationSpec: AnimationSpec<Dp>) {
+    private fun collapse(animationSpec: AnimationSpec<Dp>) {
         onWasExpandedChanged(false)
         coroutineScope.launch {
             animatable.animateTo(animatable.lowerBound!!, animationSpec)
@@ -179,6 +183,12 @@ class BottomSheetState(
         expand(tween(300))
     }
 
+    fun snapTo(value: Dp) {
+        coroutineScope.launch {
+            animatable.snapTo(value)
+        }
+    }
+
     fun nestedScrollConnection(initialIsTopReached: Boolean = true): NestedScrollConnection {
         return object : NestedScrollConnection {
             var isTopReached = initialIsTopReached