diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 30240ad16..294a7c2e2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -636,6 +636,11 @@ public class ConversationFragment extends Fragment
   }
 
   private void handleReplyMessage(final MessageRecord message) {
+    if (getActivity() != null) {
+      //noinspection ConstantConditions
+      ((AppCompatActivity) getActivity()).getSupportActionBar().collapseActionView();
+    }
+
     listener.handleReplyMessage(message);
   }