diff --git a/res/css/views/rooms/_MemberListHeaderView.pcss b/res/css/views/rooms/_MemberListHeaderView.pcss
index 6ebc27bacf..93d63e3515 100644
--- a/res/css/views/rooms/_MemberListHeaderView.pcss
+++ b/res/css/views/rooms/_MemberListHeaderView.pcss
@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_MemberListHeaderView {
     border-bottom: var(--cpd-border-width-1) solid var(--cpd-color-gray-400);
+    max-height: 112px;
 
     .mx_MemberListHeaderView_container {
         margin-top: var(--cpd-space-6x);
diff --git a/src/components/views/rooms/MemberListView.tsx b/src/components/views/rooms/MemberListView.tsx
index b03da21388..9451d09822 100644
--- a/src/components/views/rooms/MemberListView.tsx
+++ b/src/components/views/rooms/MemberListView.tsx
@@ -69,7 +69,8 @@ const MemberListView: React.FC<IProps> = (props: IProps) => {
                             rowRenderer={rowRenderer}
                             rowHeight={56}
                             rowCount={memberCount}
-                            height={height}
+                            // Subtract the height of MemberlistHeaderView so that the parent div does not overflow
+                            height={height - 113}
                             width={width}
                         />
                     )}