diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx
index a65ce21d13..c14bec52b6 100644
--- a/web/react/components/more_direct_channels.jsx
+++ b/web/react/components/more_direct_channels.jsx
@@ -55,10 +55,10 @@ export default class MoreDirectChannels extends React.Component {
 
     onShow() {
         if ($(window).width() > 768) {
-            $(ReactDOM.findDOMNode(this.refs.modalBody)).perfectScrollbar();
-            $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 200);
+            $(ReactDOM.findDOMNode(this.refs.userList)).perfectScrollbar();
+            $(ReactDOM.findDOMNode(this.refs.userList)).css('max-height', $(window).height() - 300);
         } else {
-            $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 150);
+            $(ReactDOM.findDOMNode(this.refs.userList)).css('max-height', $(window).height() - 250);
         }
     }
 
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index d533b4e9eb..6f70e502f6 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -381,6 +381,8 @@
 .more-modal {
 
 	.user-list {
+		overflow-y: auto;
+		overflow-x: hidden;
 		margin-top: 10px;
 		max-height: 500px;
 		position: relative;