diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 69cd6ef9af..64bebdeca3 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -371,12 +371,12 @@ module.exports = React.createClass({
         return (
             <div className="mx_MemberList">
                     {this.inviteTile()}
-                    <div autoshow={true} className="mx_MemberList_joined mx_MemberList_outerWrapper">
+                    <GeminiScrollbar autoshow={true} className="mx_MemberList_joined mx_MemberList_outerWrapper">
                         <div className="mx_MemberList_wrapper">
                             {this.makeMemberTiles('join', this.state.searchQuery)}
                         </div>
                         {invitedSection}
-                    </div>
+                    </GeminiScrollbar>
                     <div className="mx_MemberList_bottom">
                     </div>
             </div>
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
index 7617a237dc..506a8ba92d 100644
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@@ -106,13 +106,13 @@ var SearchableEntityList = React.createClass({
         return (
             <div className={ "mx_SearchableEntityList " + (this.state.results.length ? "mx_SearchableEntityList_expanded" : "") }>
                 {inputBox}
-                <div className="mx_SearchableEntityList_listWrapper">
+                <GeminiScrollbar className="mx_SearchableEntityList_listWrapper">
                     <div autoshow={true} className="mx_SearchableEntityList_list">
                         {this.state.results.map((entity) => {
                             return entity.getJsx();
                         })}
                     </div>
-                </div>
+                </GeminiScrollbar>
                 { this.state.results.length ? <div className="mx_SearchableEntityList_hrWrapper"><hr/></div> : '' }
             </div>
         );