diff --git a/src/compose/ComposeBox.js b/src/compose/ComposeBox.js
index 58b9141449a..68477ad8324 100644
--- a/src/compose/ComposeBox.js
+++ b/src/compose/ComposeBox.js
@@ -131,12 +131,15 @@ class ComposeBox extends PureComponent<Props, State> {
   };
 
   handleMessageFocus = () => {
+    const { topic } = this.state;
     const { lastMessageTopic } = this.props;
-    this.setState(({ topic }) => ({
+    this.setState({
       isMessageFocused: true,
       isMenuExpanded: false,
-      topic: topic || lastMessageTopic,
-    }));
+    });
+    setTimeout(() => {
+      this.handleTopicChange(topic || lastMessageTopic);
+    }, 200); // wait, to hope the component is shown
   };
 
   handleMessageBlur = () => {