diff --git a/Linphone/view/Page/Form/Chat/SelectedChatView.qml b/Linphone/view/Page/Form/Chat/SelectedChatView.qml
index 194775c54..023ce4686 100644
--- a/Linphone/view/Page/Form/Chat/SelectedChatView.qml
+++ b/Linphone/view/Page/Form/Chat/SelectedChatView.qml
@@ -205,12 +205,22 @@ FocusScope {
                         RoundButton {
                             icon.source: AppIcons.upArrow
                             style: ButtonStyle.noBackground
-                            onClicked: chatMessagesListView.findIndexWithFilter(false)
+                            onClicked: {
+                                if (chatMessagesListView.filterText !== chatMessagesSearchBar.text)
+                                    chatMessagesListView.filterText = chatMessagesSearchBar.text
+                                else
+                                    chatMessagesListView.findIndexWithFilter(false)
+                            }
                         }
                         RoundButton {
                             icon.source: AppIcons.downArrow
                             style: ButtonStyle.noBackground
-                            onClicked: chatMessagesListView.findIndexWithFilter(true)
+                            onClicked: {
+                                if (chatMessagesListView.filterText !== chatMessagesSearchBar.text)
+                                    chatMessagesListView.filterText = chatMessagesSearchBar.text
+                                else
+                                    chatMessagesListView.findIndexWithFilter(true)
+                            }
                         }
                     }
                     RoundButton {