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 1f4db954947..a41563d8f23 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
@@ -54,6 +54,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.doOnPreDraw
+import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentResultListener
@@ -532,7 +533,9 @@ class ConversationFragment :
 
   private val motionEventRelay: MotionEventRelay by viewModels(ownerProducer = { requireActivity() })
 
-  private val actionModeCallback = ActionModeCallback()
+  private val actionModeCallback by lazy {
+    ActionModeCallback()
+  }
 
   private val container: InputAwareConstraintLayout
     get() = requireView() as InputAwareConstraintLayout
@@ -3643,7 +3646,7 @@ class ConversationFragment :
       mode.title = calculateSelectedItemCount()
 
       searchMenuItem?.collapseActionView()
-      binding.toolbar.visible = false
+      binding.toolbar.isInvisible = true
       if (scheduledMessagesStub.isVisible) {
         reShowScheduleMessagesBar = true
         scheduledMessagesStub.visibility = View.GONE
@@ -3661,7 +3664,7 @@ class ConversationFragment :
       adapter.clearSelection()
       setBottomActionBarVisibility(false)
 
-      binding.toolbar.visible = true
+      binding.toolbar.isInvisible = false
       if (reShowScheduleMessagesBar) {
         scheduledMessagesStub.visibility = View.VISIBLE
         reShowScheduleMessagesBar = false