diff --git a/src/compose/ComposeBox.js b/src/compose/ComposeBox.js
index 684db0fffa..23bc6d19e6 100644
--- a/src/compose/ComposeBox.js
+++ b/src/compose/ComposeBox.js
@@ -431,6 +431,12 @@ const ComposeBox: React$AbstractComponent<Props, ImperativeHandle> = forwardRef(
           return;
         }
 
+        if (topicSelectionAllowed && topicInputState.value === '' && message.type === 'stream') {
+          // Later, this won't be necessary in the case of composing a new
+          // message. See TODO above about re-narrowing to `message`'s
+          // conversation.
+          setTopicInputValue(message.subject);
+        }
         const quoteAndReplyText = getQuoteAndReplyText({
           message,
           rawContent,
@@ -454,6 +460,9 @@ const ComposeBox: React$AbstractComponent<Props, ImperativeHandle> = forwardRef(
       setMessageInputValue,
       zulipFeatureLevel,
       _,
+      topicSelectionAllowed,
+      topicInputState.value,
+      setTopicInputValue,
       messageInputRef,
     ],
   );