diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart
index d14e9a54..967ec08e 100644
--- a/packages/stream_chat_flutter/lib/src/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input.dart
@@ -2280,7 +2280,8 @@ class MessageInputState extends State<MessageInput> {
   void didChangeDependencies() {
     _streamChatTheme = StreamChatTheme.of(context);
     _messageInputTheme = MessageInputTheme.of(context);
-    if (widget.editMessage != null && !_initialized) {
+    if ((widget.editMessage != null || widget.initialMessage != null) &&
+        !_initialized) {
       FocusScope.of(context).requestFocus(_focusNode);
       _initialized = true;
     }