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 6792e150a3..58618e9558 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
@@ -170,6 +170,7 @@ import org.thoughtcrime.securesms.conversation.drafts.DraftViewModel
 import org.thoughtcrime.securesms.conversation.mutiselect.ConversationItemAnimator
 import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectItemDecoration
 import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart
+import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardBottomSheet
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragment
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs
 import org.thoughtcrime.securesms.conversation.quotes.MessageQuotesBottomSheet
@@ -334,7 +335,8 @@ class ConversationFragment :
   ScheduleMessageDialogCallback,
   ConversationBottomSheetCallback,
   SafetyNumberBottomSheet.Callbacks,
-  EnableCallNotificationSettingsDialog.Callback {
+  EnableCallNotificationSettingsDialog.Callback,
+  MultiselectForwardBottomSheet.Callback {
 
   companion object {
     private val TAG = Log.tag(ConversationFragment::class.java)
@@ -776,6 +778,12 @@ class ConversationFragment :
     adapter.notifyDataSetChanged()
   }
 
+  override fun onFinishForwardAction() {
+    actionMode?.finish()
+  }
+
+  override fun onDismissForwardSheet() = Unit
+
   //endregion
 
   private fun observeConversationThread() {