diff --git a/Linphone/view/Control/Display/Chat/ChatListView.qml b/Linphone/view/Control/Display/Chat/ChatListView.qml
index cfd16f50e..f79103f13 100644
--- a/Linphone/view/Control/Display/Chat/ChatListView.qml
+++ b/Linphone/view/Control/Display/Chat/ChatListView.qml
@@ -447,7 +447,6 @@ ListView {
                 } else {
                     mainItem.chatClicked(modelData)
                     mainItem.currentIndex = model.index
-                    mainItem.forceActiveFocus()
                 }
             }
         }
diff --git a/Linphone/view/Control/Display/Chat/ChatMessagesListView.qml b/Linphone/view/Control/Display/Chat/ChatMessagesListView.qml
index 330510606..115c49176 100644
--- a/Linphone/view/Control/Display/Chat/ChatMessagesListView.qml
+++ b/Linphone/view/Control/Display/Chat/ChatMessagesListView.qml
@@ -46,7 +46,10 @@ ListView {
         })
     }
     
-    onChatChanged: lastItemVisible = false
+    onChatChanged: {
+        lastItemVisible = false
+        forceActiveFocus()
+    }
 
     Button {
         visible: !mainItem.lastItemVisible
diff --git a/Linphone/view/Page/Layout/Chat/GroupChatInfoParticipants.qml b/Linphone/view/Page/Layout/Chat/GroupChatInfoParticipants.qml
index a881397a0..d2e307e79 100644
--- a/Linphone/view/Page/Layout/Chat/GroupChatInfoParticipants.qml
+++ b/Linphone/view/Page/Layout/Chat/GroupChatInfoParticipants.qml
@@ -38,20 +38,23 @@ ColumnLayout {
 		}
 	}
 
-    Rectangle {
+	Control.Control {
 		visible: expandButton.checked
-        Layout.fillWidth: true
-        Layout.topMargin: Math.round(9 * DefaultStyle.dp)
-        color: DefaultStyle.grey_100
-        radius: Math.round(15 * DefaultStyle.dp)
-        height: participants.length > 0 ? contentColumn.implicitHeight : Math.round(90 * DefaultStyle.dp)
+		Layout.fillWidth: true
+		Layout.topMargin: Math.round(9 * DefaultStyle.dp)
+		height: Math.min(contentColumn.implicitHeight, Math.round(90 * DefaultStyle.dp))
+		bottomPadding: Math.round(15 * DefaultStyle.dp)
 
-        ColumnLayout {
-            id: contentColumn
-            anchors.fill: parent
-            spacing: Math.round(16 * DefaultStyle.dp)
-            
-            Item {
+		background: Rectangle {
+			color: DefaultStyle.grey_100
+			radius: Math.round(15 * DefaultStyle.dp)
+		}
+
+		contentItem: ColumnLayout {
+			id: contentColumn
+			spacing: Math.round(16 * DefaultStyle.dp)
+			
+			Item {
 				Layout.topMargin: Math.round(7 * DefaultStyle.dp)
 			}
 
@@ -119,8 +122,8 @@ ColumnLayout {
 									Layout.fillWidth: true
 									//: "Show contact"
 									text: contact && contact.core && contact.core.isAppFriend ? qsTr("menu_see_existing_contact") :
-																  //: "Add to contacts"
-																  qsTr("menu_add_address_to_contacts")
+																//: "Add to contacts"
+																qsTr("menu_add_address_to_contacts")
 									icon.source: (contact && contact.core && contact.core.isAppFriend)
 										? AppIcons.adressBook
 										: AppIcons.plusCircle
@@ -188,11 +191,11 @@ ColumnLayout {
 								}
 							}
 						}
-                    }
+					}
 					
 				}
 			}
-            
+			
 			MediumButton {
 				id: manageParticipants
 				visible: mainItem.isGroupEditable()
@@ -205,12 +208,7 @@ ColumnLayout {
 				style: ButtonStyle.secondary
 				onClicked: mainItem.manageParticipantsRequested()
 				Layout.alignment: Qt.AlignHCenter
-				Layout.bottomMargin: Math.round(17 * DefaultStyle.dp)
 			}
-			Item {
-				visible: !manageParticipants.visible
-				Layout.bottomMargin: Math.round(7 * DefaultStyle.dp)
-			}
-        }
-    }
+		}
+	}
 }