diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index a9d4e2560f..3eae4f00d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -852,10 +852,12 @@ class ConversationFragment :
     presentGroupCallJoinButton()
 
     binding.scrollToBottom.setOnClickListener {
+      binding.conversationItemRecycler.stopScroll()
       scrollToPositionDelegate.resetScrollPosition()
     }
 
     binding.scrollToMention.setOnClickListener {
+      binding.conversationItemRecycler.stopScroll()
       scrollToNextMention()
     }