diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fe8bf81ead..043d1f7e76a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,10 +67,12 @@
 
 ## stream-chat-android-compose
 ### 🐞 Fixed
+- Fix keyboard not closing when opening the attachments picker from `MessagesScreen`. [#5506](https://github.com/GetStream/stream-chat-android/pull/5506)
 
 ### ⬆️ Improved
 
 ### ✅ Added
+- Add `ChatTheme.keyboardBehaviour` property to customize different keyboard behaviours. [#5506](https://github.com/GetStream/stream-chat-android/pull/5506)
 
 ### ⚠️ Changed
 
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/theme/ChatTheme.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/theme/ChatTheme.kt
index 1c441a21f6d..71708483d12 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/theme/ChatTheme.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/theme/ChatTheme.kt
@@ -219,7 +219,7 @@ private val LocalStreamMediaRecorder = compositionLocalOf<StreamMediaRecorder> {
     error("No StreamMediaRecorder provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
 }
 private val LocalKeyboardBehaviour = compositionLocalOf<StreamKeyboardBehaviour> {
-    error("No KeyboardBehaviour provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
+    error("No StreamKeyboardBehaviour provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
 }
 
 /**