diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/EnabledMessageComposer.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/EnabledMessageComposer.kt
index 900e5a2f26b..e2de04840ec 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/EnabledMessageComposer.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/EnabledMessageComposer.kt
@@ -282,6 +282,9 @@ fun EnabledMessageComposer(
                 }
             }
 
+            BackHandler(inputStateHolder.inputType is MessageCompositionType.Editing) {
+                cancelEdit()
+            }
             BackHandler(isImeVisible || inputStateHolder.optionsVisible) {
                 inputStateHolder.handleBackPressed(
                     isImeVisible,
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt
index 7981a6849ff..5cd0d3f7b1d 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt
@@ -200,7 +200,7 @@ private fun InputContent(
     onPlusClick: () -> Unit,
     modifier: Modifier,
 ) {
-    if (!showOptions) {
+    if (!showOptions && inputType is MessageCompositionType.Composing) {
         AdditionalOptionButton(
             isSelected = false,
             onClick = {