diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index d93b5f793..d46f4fe4c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -1172,6 +1172,9 @@ public class ConversationParentFragment extends Fragment
     if (emojiDrawerStub.resolved() && emojiDrawerStub.get().isShowing() && !emojiDrawerStub.get().isEmojiSearchMode()) {
       emojiDrawerStub.get().hide(true);
     }
+    if (attachmentKeyboardStub.resolved() && attachmentKeyboardStub.get().isShowing()) {
+      attachmentKeyboardStub.get().hide(true);
+    }
   }
 
   @Subscribe(threadMode = ThreadMode.MAIN)