diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/views/MyScalableRecyclerView.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/views/MyScalableRecyclerView.kt
index 07b2f8139..3b1a6add8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/views/MyScalableRecyclerView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/views/MyScalableRecyclerView.kt
@@ -78,6 +78,9 @@ class MyScalableRecyclerView : RecyclerView {
         when (ev.action) {
             MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
                 dragSelectActive = false
+                inTopHotspot = false
+                inBottomHotspot = false
+                autoScrollHandler.removeCallbacks(autoScrollRunnable)
                 mCurrScaleFactor = 1.0f
                 mLastUp = System.currentTimeMillis()
                 return true