diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareConstraintLayout.kt b/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareConstraintLayout.kt
index 7adc9fef5c..ccd320f44f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareConstraintLayout.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareConstraintLayout.kt
@@ -37,6 +37,11 @@ class InputAwareConstraintLayout @JvmOverloads constructor(
     hideInput(resetKeyboardGuideline = false)
   }
 
+  fun hideAll(imeTarget: EditText) {
+    ViewUtil.hideKeyboard(context, imeTarget)
+    hideInput(resetKeyboardGuideline = true)
+  }
+
   fun toggleInput(fragmentCreator: FragmentCreator, imeTarget: EditText, showSoftKeyOnHide: Boolean = false) {
     if (fragmentCreator.id == inputId) {
       if (showSoftKeyOnHide) {
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 5cd5ed3786..edf6a9ba5a 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
@@ -2412,6 +2412,7 @@ class ConversationFragment :
 
       disposables += viewModel.getTemporaryViewOnceUri(messageRecord).subscribeBy(
         onSuccess = {
+          container.hideAll(composeText)
           startActivity(ViewOnceMessageActivity.getIntent(requireContext(), messageRecord.id, it))
         },
         onComplete = {
@@ -2666,6 +2667,8 @@ class ConversationFragment :
         }
       }
 
+      container.hideAll(composeText)
+
       sharedElement.transitionName = MediaPreviewV2Activity.SHARED_ELEMENT_TRANSITION_NAME
       requireActivity().setExitSharedElementCallback(MaterialContainerTransformSharedElementCallback())
       val options = ActivityOptions.makeSceneTransitionAnimation(requireActivity(), sharedElement, MediaPreviewV2Activity.SHARED_ELEMENT_TRANSITION_NAME)