diff --git a/packages/stream_chat_flutter/lib/src/message_input/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input/message_input.dart
index 2ba5c038..e55fac19 100644
--- a/packages/stream_chat_flutter/lib/src/message_input/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input/message_input.dart
@@ -538,7 +538,7 @@ class MessageInputState extends State<MessageInput>
               ),
             ),
           );
-          if (_isEditing) {
+          if (!_isEditing) {
             child = Material(
               elevation: 8,
               child: child,
diff --git a/packages/stream_chat_flutter/lib/src/message_input/stream_attachment_picker.dart b/packages/stream_chat_flutter/lib/src/message_input/stream_attachment_picker.dart
index 7f6a6f6e..93c86d72 100644
--- a/packages/stream_chat_flutter/lib/src/message_input/stream_attachment_picker.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input/stream_attachment_picker.dart
@@ -334,8 +334,10 @@ class _StreamAttachmentPickerState extends State<StreamAttachmentPicker> {
                         onMediaSelected: (media) {
                           if (messageInputController.attachments
                               .any((e) => e.id == media.id)) {
-                            setState(() => messageInputController.attachments
-                                .removeWhere((e) => e.id == media.id));
+                            messageInputController
+                                .removeAttachmentById(media.id);
+                            // setState(() => messageInputController.attachments
+                            //     .removeWhere((e) => e.id == media.id));
                           } else {
                             _addAssetAttachment(media);
                           }