diff --git a/lib/screens/channel_chat_screen.dart b/lib/screens/channel_chat_screen.dart
index bf05110..9f40684 100644
--- a/lib/screens/channel_chat_screen.dart
+++ b/lib/screens/channel_chat_screen.dart
@@ -935,6 +935,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
     connector.sendChannelMessage(widget.channel, messageText);
     _textController.clear();
     _cancelReply();
+    _textFieldFocusNode.requestFocus();
   }
 
   String _formatTime(DateTime time) {
diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart
index ad897a0..ea657ff 100644
--- a/lib/screens/chat_screen.dart
+++ b/lib/screens/chat_screen.dart
@@ -429,6 +429,7 @@ class _ChatScreenState extends State<ChatScreen> {
 
     connector.sendMessage(widget.contact, text);
     _textController.clear();
+    _textFieldFocusNode.requestFocus();
   }
 
   void _showPathHistory(BuildContext context) {
diff --git a/lib/screens/repeater_cli_screen.dart b/lib/screens/repeater_cli_screen.dart
index abfb06a..1c7ff43 100644
--- a/lib/screens/repeater_cli_screen.dart
+++ b/lib/screens/repeater_cli_screen.dart
@@ -168,6 +168,7 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
 
     _commandController.clear();
     _historyIndex = -1;
+    _commandFocusNode.requestFocus();
 
     // Auto-scroll to bottom
     Future.delayed(const Duration(milliseconds: 100), () {