diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index b32f14c001..4702399ed2 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -123,7 +123,7 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
   @Override
   public void onBackPressed() {
     MediaSendFragment sendFragment = (MediaSendFragment) getSupportFragmentManager().findFragmentByTag(TAG_SEND);
-    if (sendFragment == null || !sendFragment.handleBackPress()) {
+    if (sendFragment == null || !sendFragment.isVisible() || !sendFragment.handleBackPress()) {
       super.onBackPressed();
     }
   }