diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index d57e7dfb62..33e9f6993d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -319,6 +319,9 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
     MediaSendFragment sendFragment  = (MediaSendFragment) getSupportFragmentManager().findFragmentByTag(TAG_SEND);
 
     if (sendFragment == null || !sendFragment.isVisible() || !hud.isInputOpen()) {
+      if (captionAndRail != null) {
+        captionAndRail.setVisibility(View.VISIBLE);
+      }
       super.onBackPressed();
     } else {
       hud.hideCurrentInput(composeText);