diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index d20329fcd8..ed0e5cbc41 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -72,7 +72,7 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var presenceClass = PRESENCE_CLASS[this.props.presenceState];
+        var presenceClass = PRESENCE_CLASS[this.props.presenceState] || "mx_EntityTile_offline";
         var mainClassName = "mx_EntityTile ";
         mainClassName += presenceClass;
         if (this.state.hover) {
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index e38d6ae41d..69cd6ef9af 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -362,7 +362,7 @@ module.exports = React.createClass({
             invitedSection = (
                 <div className="mx_MemberList_invited">
                     <h2>Invited</h2>
-                    <div className="mx_MemberList_wrapper">
+                    <div autoshow={true} className="mx_MemberList_wrapper">
                         {invitedMemberTiles}
                     </div>
                 </div>
@@ -370,15 +370,15 @@ module.exports = React.createClass({
         }
         return (
             <div className="mx_MemberList">
-                <GeminiScrollbar autoshow={true} className="mx_MemberList_border">
                     {this.inviteTile()}
-                    <div>
+                    <div autoshow={true} className="mx_MemberList_joined mx_MemberList_outerWrapper">
                         <div className="mx_MemberList_wrapper">
                             {this.makeMemberTiles('join', this.state.searchQuery)}
                         </div>
+                        {invitedSection}
+                    </div>
+                    <div className="mx_MemberList_bottom">
                     </div>
-                    {invitedSection}
-                </GeminiScrollbar>
             </div>
         );
     }
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
index b6232362ac..7617a237dc 100644
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@@ -104,13 +104,16 @@ var SearchableEntityList = React.createClass({
         }
 
         return (
-            <div>
+            <div className={ "mx_SearchableEntityList " + (this.state.results.length ? "mx_SearchableEntityList_expanded" : "") }>
                 {inputBox}
-                <div className="mx_SearchableEntityList_list">
-                    {this.state.results.map((entity) => {
-                        return entity.getJsx();
-                    })}
+                <div className="mx_SearchableEntityList_listWrapper">
+                    <div autoshow={true} className="mx_SearchableEntityList_list">
+                        {this.state.results.map((entity) => {
+                            return entity.getJsx();
+                        })}
+                    </div>
                 </div>
+                { this.state.results.length ? <div className="mx_SearchableEntityList_hrWrapper"><hr/></div> : '' }
             </div>
         );
     }