diff --git a/Linphone/core/proxy/LimitProxy.cpp b/Linphone/core/proxy/LimitProxy.cpp
index 439aee1a3..b088fa6ca 100644
--- a/Linphone/core/proxy/LimitProxy.cpp
+++ b/Linphone/core/proxy/LimitProxy.cpp
@@ -127,7 +127,7 @@ void LimitProxy::setMaxDisplayItems(int maxItems) {
 		emit maxDisplayItemsChanged();
 
 		if (model && getDisplayCount(modelCount) != oldCount) {
-			invalidate();
+			invalidateFilter();
 		}
 	}
 }
diff --git a/Linphone/view/Control/Button/IconLabelButton.qml b/Linphone/view/Control/Button/IconLabelButton.qml
index 0b8d6189d..57d8c8460 100644
--- a/Linphone/view/Control/Button/IconLabelButton.qml
+++ b/Linphone/view/Control/Button/IconLabelButton.qml
@@ -36,7 +36,6 @@ Button {
 			id: textItem
 			horizontalAlignment: Text.AlignLeft
 			verticalAlignment: Text.AlignVCenter
-			Layout.preferredWidth: textMetrics.advanceWidth
 			Layout.fillWidth: true
 			wrapMode: Text.WrapAnywhere
 			text: mainItem.text
diff --git a/Linphone/view/Page/Form/Chat/SelectedChatView.qml b/Linphone/view/Page/Form/Chat/SelectedChatView.qml
index 110a04fc9..aabe612f2 100644
--- a/Linphone/view/Page/Form/Chat/SelectedChatView.qml
+++ b/Linphone/view/Page/Form/Chat/SelectedChatView.qml
@@ -238,7 +238,10 @@ FocusScope {
                     columns: mainItem.call ? 1 : children.length
                     rows: 1
                     onVisibleChanged: {
-                        if(!visible) chatMessagesSearchBar.clearText()
+                        if(!visible) {
+                            chatMessagesSearchBar.clearText()
+                            chatMessagesListView.filterText = ""
+                        }
                         else chatMessagesSearchBar.forceActiveFocus()
                     }
                     columnSpacing: Utils.getSizeWithScreenRatio(50)
diff --git a/Linphone/view/Page/Form/Contact/ContactEdition.qml b/Linphone/view/Page/Form/Contact/ContactEdition.qml
index 74caaf3db..5cbc61e6f 100644
--- a/Linphone/view/Page/Form/Contact/ContactEdition.qml
+++ b/Linphone/view/Page/Form/Contact/ContactEdition.qml
@@ -293,6 +293,7 @@ MainRightPanel {
 					}
 					delegate: FormItemLayout {
 						label: modelData.label
+						Layout.fillWidth: true
 						contentItem: RowLayout {
 							id: addressLayout
                             spacing: Utils.getSizeWithScreenRatio(10)