diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 06cae0658f..0f75ff22ff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -850,6 +850,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   public void onAttachmentMediaClicked(@NonNull Media media) {
     linkPreviewViewModel.onUserCancel();
     startActivityForResult(MediaSendActivity.buildEditorIntent(ConversationActivity.this, Collections.singletonList(media), recipient.get(), composeText.getTextTrimmed(), sendButton.getSelectedTransport()), MEDIA_SENDER);
+    container.hideCurrentInput(composeText);
   }
 
   @Override
@@ -871,8 +872,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         AttachmentManager.selectLocation(this, PICK_LOCATION);
         break;
     }
-    // TODO [greyson] [attachment] Add these
-//    attachmentManager.capturePhoto(this, TAKE_PHOTO); break;
+
+    container.hideCurrentInput(composeText);
   }
 
   @Override