diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
index 4446d8051e..415252e9be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
@@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.components.KeyboardEntryDialogFragment
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard
 import org.thoughtcrime.securesms.components.mention.MentionAnnotation
+import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher
 import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerFragment
 import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerViewModel
 import org.thoughtcrime.securesms.keyboard.KeyboardPage
@@ -65,6 +66,11 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     input = view.findViewById(R.id.add_a_message_input)
     input.setText(requireArguments().getCharSequence(ARG_INITIAL_TEXT))
+    input.addTextChangedListener(object : SimpleTextWatcher() {
+      override fun onTextChanged(text: String?) {
+        viewModel.setMessage(text)
+      }
+    })
 
     emojiDrawerToggle = view.findViewById(R.id.emoji_toggle)
     emojiDrawerStub = Stub(view.findViewById(R.id.emoji_drawer_stub))
@@ -78,10 +84,7 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
     hud.setOnClickListener { dismissAllowingStateLoss() }
 
     val confirm: View = view.findViewById(R.id.confirm_button)
-    confirm.setOnClickListener {
-      viewModel.setMessage(input.text)
-      dismissAllowingStateLoss()
-    }
+    confirm.setOnClickListener { dismissAllowingStateLoss() }
 
     disposables.add(
       viewModel.hudCommands.observeOn(AndroidSchedulers.mainThread()).subscribe {