diff --git a/lib/widgets/chat_page/composer/chat_box.dart b/lib/widgets/chat_page/composer/chat_box.dart
index 3c2057e..dae8bc8 100644
--- a/lib/widgets/chat_page/composer/chat_box.dart
+++ b/lib/widgets/chat_page/composer/chat_box.dart
@@ -149,6 +149,7 @@ class ChatBox extends HookConsumerWidget {
                           enabled: canSendMessages,
                           maxLines: 12,
                           minLines: 1,
+                          autofocus: true,
                           decoration: InputDecoration(
                             hintText: canSendMessages
                                 ? "Your message here..."
@@ -159,6 +160,8 @@ class ChatBox extends HookConsumerWidget {
                           key: key,
                           // TODO: Setting for send on enter on / off
                           onFieldSubmitted: (_) => send(),
+                          // Don't defocus on submit
+                          onEditingComplete: () {},
                           textInputAction: TextInputAction.done,
                           focusNode: node,
                         ),