diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index d522fa883..63dbd6ab5 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -1287,8 +1287,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   @Override
   public void onQuoteDismissed() {
+    if (isEditing) composeText.setText("");
     isEditing = false;
-    composeText.setText("");
   }
 
   // media selected by the system keyboard