diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
index aeb3f05fe4..b7491ae6b2 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
@@ -269,7 +269,10 @@ class RoomDetailFragment :
                 ?: "", event.senderName, composerLayout.composerRelatedMessageAvatar)
 
         composerLayout.composerEditText.setSelection(composerLayout.composerEditText.text.length)
-        composerLayout.expand()
+        composerLayout.expand {
+            //need to do it here also when not using quick reply
+            focusComposerAndShowKeyboard()
+        }
         focusComposerAndShowKeyboard()
     }