diff --git a/lib/widgets/composer/composer.dart b/lib/widgets/composer/composer.dart
index ca3de8a..5eb7db3 100644
--- a/lib/widgets/composer/composer.dart
+++ b/lib/widgets/composer/composer.dart
@@ -234,7 +234,10 @@ class Composer extends HookConsumerWidget {
                                   child: TextField(
                                     maxLines: 12,
                                     minLines: 1,
-                                    autofocus: true,
+                                    autofocus:
+                                        Platform.isLinux ||
+                                        Platform.isMacOS ||
+                                        Platform.isWindows,
                                     decoration: .new(
                                       hintText: "Your message here...",
                                       border: .none,
diff --git a/lib/widgets/room_chat.dart b/lib/widgets/room_chat.dart
index cb1e695..e867008 100644
--- a/lib/widgets/room_chat.dart
+++ b/lib/widgets/room_chat.dart
@@ -467,6 +467,8 @@ class RoomChat extends HookConsumerWidget {
                           AsyncData(:final value?) ||
                           AsyncLoading(:final value?) => CustomScrollView(
                             controller: scrollController,
+                            keyboardDismissBehavior:
+                                ScrollViewKeyboardDismissBehavior.onDrag,
                             slivers: [
                               SliverToBoxAdapter(
                                 child: Padding(