diff --git a/lib/widgets/chat/chat_input.dart b/lib/widgets/chat/chat_input.dart
index d951cf00..30d2e148 100644
--- a/lib/widgets/chat/chat_input.dart
+++ b/lib/widgets/chat/chat_input.dart
@@ -73,10 +73,8 @@ class ChatInput extends HookConsumerWidget {
     final chatSubscribe = ref.watch(chatSubscribeNotifierProvider(chatRoom.id));
 
     void send() {
+      inputFocusNode.requestFocus();
       onSend.call();
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        inputFocusNode.requestFocus();
-      });
     }
 
     void insertNewLine() {
@@ -539,6 +537,10 @@ class ChatInput extends HookConsumerWidget {
                           onTapOutside:
                               (_) =>
                                   FocusManager.instance.primaryFocus?.unfocus(),
+                          textInputAction:
+                              settings.enterToSend
+                                  ? TextInputAction.send
+                                  : null,
                           onSubmitted:
                               settings.enterToSend ? (_) => send() : null,
                         );