diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt
index 624e38a6d7..9c2a2bbe63 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt
@@ -55,6 +55,11 @@ abstract class KeyboardEntryDialogFragment(@LayoutRes contentLayoutId: Int) :
     }
   }
 
+  override fun onPause() {
+    super.onPause()
+    hasShown = false
+  }
+
   override fun onKeyboardShown() {
     hasShown = true
   }
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 a4dcd8cac2..1362fdf9bd 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
@@ -128,12 +128,6 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
     ViewUtil.focusAndShowKeyboard(binding.content.addAMessageInput)
   }
 
-  override fun onPause() {
-    super.onPause()
-
-    ViewUtil.hideKeyboard(requireContext(), binding.content.addAMessageInput)
-  }
-
   override fun onDismiss(dialog: DialogInterface) {
     super.onDismiss(dialog)
     if (isResumed) {