diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 5e6be0394..67d76dedc 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -881,7 +881,6 @@ class ChatController extends State<ChatPageWithRoom>
   Future<String?> sendFakeMessage(Event? edit, Event? reply) async {
     if (sendController.text.trim().isEmpty) return null;
     final message = sendController.text;
-    inputFocus.unfocus();
     sendController.setSystemText("", EditTypeEnum.other);
 
     return room.sendFakeMessage(
@@ -904,6 +903,10 @@ class ChatController extends State<ChatPageWithRoom>
     pendingText = '';
 
     final tempEventId = await sendFakeMessage(edit, reply);
+    if (!inputFocus.hasFocus) {
+      inputFocus.requestFocus();
+    }
+
     final content = await choreographer.getMessageContent(message);
     choreographer.clear();
 
diff --git a/lib/pangea/choreographer/choreographer.dart b/lib/pangea/choreographer/choreographer.dart
index a04c1e738..0a5e11d2c 100644
--- a/lib/pangea/choreographer/choreographer.dart
+++ b/lib/pangea/choreographer/choreographer.dart
@@ -353,6 +353,7 @@ class Choreographer extends ChangeNotifier {
   }
 
   void _onOpenIT() {
+    inputFocus.unfocus();
     final itMatch = igcController.openMatches.firstWhere(
       (match) => match.updatedMatch.isITStart,
       orElse: () =>
@@ -378,7 +379,6 @@ class Choreographer extends ChangeNotifier {
       );
     }
 
-    debugPrint("DISMISSED: ${itController.dismissed}");
     if (itController.dismissed) {
       _timesDismissedIT.value = _timesDismissedIT.value + 1;
     }