diff --git a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt
index 8d08e1fa11..99e300096a 100644
--- a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt
+++ b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt
@@ -35,7 +35,6 @@ import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.constraintlayout.widget.ConstraintSet
-import androidx.core.text.toSpannable
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
@@ -119,7 +118,7 @@ class RichTextComposerLayout @JvmOverloads constructor(
 
     private val dimensionConverter = DimensionConverter(resources)
 
-    fun setFullScreen(isFullScreen: Boolean) {
+    fun setFullScreen(isFullScreen: Boolean, manageKeyboard: Boolean) {
         editText.updateLayoutParams<ViewGroup.LayoutParams> {
             height = if (isFullScreen) 0 else ViewGroup.LayoutParams.WRAP_CONTENT
         }
@@ -135,10 +134,12 @@ class RichTextComposerLayout @JvmOverloads constructor(
         )
 
         views.bottomSheetHandle.isVisible = isFullScreen
-        if (isFullScreen) {
-            editText.showKeyboard(true)
-        } else {
-            editText.hideKeyboard()
+        if (manageKeyboard) {
+            if (isFullScreen) {
+                editText.showKeyboard(true)
+            } else {
+                editText.hideKeyboard()
+            }
         }
         this.isFullScreen = isFullScreen
     }
@@ -213,7 +214,8 @@ class RichTextComposerLayout @JvmOverloads constructor(
         }
 
         views.sendButton.setOnClickListener {
-            val textMessage = views.richTextComposerEditText.getMarkdown() // text?.toSpannable() ?: ""
+            val textMessage =
+                views.richTextComposerEditText.getMarkdown() // text?.toSpannable() ?: ""
             callback?.onSendMessage(textMessage)
         }
 
@@ -506,7 +508,8 @@ class RichTextComposerLayout @JvmOverloads constructor(
             is MessageComposerMode.Reply -> {
                 // TODO We need sender info
                 // val senderInfo = mode.event.senderInfo
-                val userName = "TODO Sender name" // senderInfo.displayName ?: senderInfo.disambiguatedDisplayName
+                val userName =
+                    "TODO Sender name" // senderInfo.displayName ?: senderInfo.disambiguatedDisplayName
                 views.composerModeTitleView.text =
                     resources.getString(R.string.replying_to, userName)
                 views.composerModeIconView.setImageResource(R.drawable.ic_reply)
diff --git a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt
index 9e4f3c24c3..5e756f4ff7 100644
--- a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt
+++ b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt
@@ -54,7 +54,7 @@ fun TextComposer(
                     }
 
                 }
-                setFullScreen(fullscreen)
+                setFullScreen(fullscreen, true)
                 (this as MessageComposerView).apply {
                     setup(isInDarkMode)
                 }
@@ -68,7 +68,7 @@ fun TextComposer(
             // whenever the state changes
             // Example of Compose -> View communication
             val messageComposerView = (view as MessageComposerView)
-            view.setFullScreen(fullscreen)
+            view.setFullScreen(fullscreen, false)
             messageComposerView.sendButton.isInvisible = !composerCanSendMessage
             messageComposerView.setTextIfDifferent(composerText ?: "")
         }