diff --git a/skins/base/css/organisms/MemberList.css b/skins/base/css/organisms/MemberList.css
index b56e3f11..574ae18f 100644
--- a/skins/base/css/organisms/MemberList.css
+++ b/skins/base/css/organisms/MemberList.css
@@ -18,6 +18,18 @@ limitations under the License.
     height: 100%;
     margin-bottom: 100px;
     padding: 8px;
+
+    -webkit-flex: 1;
+    flex: 1;
+
+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
+    display: flex;
+
+    flex-direction: column;
+    -webkit-flex-direction: column;
 }
 
 .mx_MemberList_chevron {
@@ -29,11 +41,12 @@ limitations under the License.
 .mx_MemberList_border {
     border: 1px solid #a9dbf4;
     overflow-y: scroll;
-    height: auto;
-    max-height: 75%;
     border-radius: 8px;
     padding: 20px 14px 14px 24px;
     background-color: #fff;
+
+    order: 1;
+    flex: 1 1 0px;
 }
 
 .mx_MemberList_wrapper {
diff --git a/skins/base/css/pages/MatrixChat.css b/skins/base/css/pages/MatrixChat.css
index 7ac51b56..1c02d8cc 100644
--- a/skins/base/css/pages/MatrixChat.css
+++ b/skins/base/css/pages/MatrixChat.css
@@ -110,5 +110,4 @@ limitations under the License.
     background-color: #f3f8fa;
     -webkit-flex: 0 0 230px;
     flex: 0 0 230px;
-    height: 100%; 
 }