diff --git a/static/js/compose_fade.js b/static/js/compose_fade.js
index f06df1ff30..a0520a8aed 100644
--- a/static/js/compose_fade.js
+++ b/static/js/compose_fade.js
@@ -74,6 +74,7 @@ function _fade_messages() {
         var all_elts = rows.get_table(current_msg_list.table_name).find(".recipient_row, .message_row");
 
         if (current_msg_list !== expected_msg_list ||
+            !compose.composing() ||
             compose.recipient() !== expected_recipient) {
             return;
         }