diff --git a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
index f763585b..41f15c81 100644
--- a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
+++ b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
@@ -625,48 +625,51 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
           topRight: Radius.circular(16),
         ),
       ),
-      builder: (context) => StreamChannel(
-        channel: channel,
-        child: Flex(
-          direction: Axis.vertical,
-          mainAxisAlignment: MainAxisAlignment.end,
-          mainAxisSize: MainAxisSize.min,
-          children: <Widget>[
-            Padding(
-              padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: <Widget>[
-                  Padding(
-                    padding: const EdgeInsets.all(8),
-                    child: StreamSvgIcon.edit(
-                      color: streamChatThemeData.colorTheme.greyGainsboro,
+      builder: (context) => Padding(
+        padding: MediaQuery.of(context).viewInsets,
+        child: StreamChannel(
+          channel: channel,
+          child: Flex(
+            direction: Axis.vertical,
+            mainAxisAlignment: MainAxisAlignment.end,
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              Padding(
+                padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: <Widget>[
+                    Padding(
+                      padding: const EdgeInsets.all(8),
+                      child: StreamSvgIcon.edit(
+                        color: streamChatThemeData.colorTheme.greyGainsboro,
+                      ),
                     ),
-                  ),
-                  const Text(
-                    'Edit Message',
-                    style: TextStyle(fontWeight: FontWeight.bold),
-                  ),
-                  IconButton(
-                    visualDensity: VisualDensity.compact,
-                    icon: StreamSvgIcon.closeSmall(),
-                    onPressed: Navigator.of(context).pop,
-                  ),
-                ],
+                    const Text(
+                      'Edit Message',
+                      style: TextStyle(fontWeight: FontWeight.bold),
+                    ),
+                    IconButton(
+                      visualDensity: VisualDensity.compact,
+                      icon: StreamSvgIcon.closeSmall(),
+                      onPressed: Navigator.of(context).pop,
+                    ),
+                  ],
+                ),
               ),
-            ),
-            if (widget.editMessageInputBuilder != null)
-              widget.editMessageInputBuilder!(context, widget.message)
-            else
-              MessageInput(
-                editMessage: widget.message,
-                preMessageSending: (m) {
-                  FocusScope.of(context).unfocus();
-                  Navigator.pop(context);
-                  return m;
-                },
-              ),
-          ],
+              if (widget.editMessageInputBuilder != null)
+                widget.editMessageInputBuilder!(context, widget.message)
+              else
+                MessageInput(
+                  editMessage: widget.message,
+                  preMessageSending: (m) {
+                    FocusScope.of(context).unfocus();
+                    Navigator.pop(context);
+                    return m;
+                  },
+                ),
+            ],
+          ),
         ),
       ),
     );
diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart
index 4f61c9fa..962d237b 100644
--- a/packages/stream_chat_flutter/lib/src/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input.dart
@@ -251,7 +251,6 @@ class MessageInputState extends State<MessageInput> {
   late final FocusNode _focusNode;
   bool _inputEnabled = true;
   bool _messageIsPresent = false;
-  bool _animateContainer = true;
   bool _commandEnabled = false;
   OverlayEntry? _commandsOverlay, _mentionsOverlay, _emojiOverlay;
   late Iterable<String> _emojiNames;
@@ -939,10 +938,6 @@ class MessageInputState extends State<MessageInput> {
   }
 
   Widget _buildFilePickerSection() {
-    if (!_openFilePickerSection) {
-      return const Offstage();
-    }
-
     final _attachmentContainsFile =
         _attachments.values.any((it) => it.type == 'file');
 
@@ -975,8 +970,7 @@ class MessageInputState extends State<MessageInput> {
     }
 
     return AnimatedContainer(
-      duration:
-          _animateContainer ? const Duration(milliseconds: 300) : Duration.zero,
+      duration: const Duration(milliseconds: 300),
       height: _openFilePickerSection ? _filePickerSize : 0,
       child: Material(
         color: _streamChatTheme.colorTheme.whiteSmoke,
@@ -1034,7 +1028,6 @@ class MessageInputState extends State<MessageInput> {
             GestureDetector(
               onVerticalDragUpdate: (update) {
                 setState(() {
-                  _animateContainer = false;
                   _filePickerSize = (_filePickerSize - update.delta.dy).clamp(
                     _kMinMediaPickerSize,
                     MediaQuery.of(context).size.height / 1.7,
@@ -1672,7 +1665,6 @@ class MessageInputState extends State<MessageInput> {
       onPressed: () async {
         if (_openFilePickerSection) {
           setState(() {
-            _animateContainer = false;
             _openFilePickerSection = false;
             _filePickerSize = _kMinMediaPickerSize;
           });
@@ -1718,7 +1710,6 @@ class MessageInputState extends State<MessageInput> {
 
           if (_openFilePickerSection) {
             setState(() {
-              _animateContainer = true;
               _openFilePickerSection = false;
               _filePickerSize = _kMinMediaPickerSize;
             });