Merge branch 'release-3.5'

1 files changed, 7 insertions, 5 deletions

diff --git a/webapp/components/more_direct_channels.jsx b/webapp/components/more_direct_channels.jsx
index f672cb617..50ab5224a 100644
--- a/webapp/components/more_direct_channels.jsx
+++ b/webapp/components/more_direct_channels.jsx
@@ -38,6 +38,7 @@ export default class MoreDirectChannels extends React.Component {
             users: null,
             loadingDMChannel: -1,
             listType: 'team',
+            show: true,
             search: false
         };
     }
@@ -60,15 +61,17 @@ export default class MoreDirectChannels extends React.Component {
     }
 
     handleHide() {
-        if (this.props.onModalDismissed) {
-            this.props.onModalDismissed();
-        }
+        this.setState({show: false});
     }
 
     handleExit() {
         if (this.exitToDirectChannel) {
             browserHistory.push(this.exitToDirectChannel);
         }
+
+        if (this.props.onModalDismissed) {
+            this.props.onModalDismissed();
+        }
     }
 
     handleShowDirectChannel(teammate, e) {
@@ -220,7 +223,7 @@ export default class MoreDirectChannels extends React.Component {
         return (
             <Modal
                 dialogClassName='more-modal more-direct-channels'
-                show={this.props.show}
+                show={this.state.show}
                 onHide={this.handleHide}
                 onExited={this.handleExit}
             >
@@ -262,6 +265,5 @@ export default class MoreDirectChannels extends React.Component {
 }
 
 MoreDirectChannels.propTypes = {
-    show: React.PropTypes.bool.isRequired,
     onModalDismissed: React.PropTypes.func
 };