Merge branch 'master' into PLT-2115

1 files changed, 3 insertions, 1 deletions

diff --git a/web/react/components/delete_channel_modal.jsx b/web/react/components/delete_channel_modal.jsx
index d9113bc9f..70e7a67a8 100644
--- a/web/react/components/delete_channel_modal.jsx
+++ b/web/react/components/delete_channel_modal.jsx
@@ -9,6 +9,8 @@ import Constants from '../utils/constants.jsx';
 
 import {FormattedMessage} from 'mm-intl';
 
+import {browserHistory} from 'react-router';
+
 export default class DeleteChannelModal extends React.Component {
     constructor(props) {
         super(props);
@@ -21,11 +23,11 @@ export default class DeleteChannelModal extends React.Component {
             return;
         }
 
+        browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/town-square');
         Client.deleteChannel(
             this.props.channel.id,
             () => {
                 AsyncClient.getChannels(true);
-                window.location.href = TeamStore.getCurrentTeamUrl() + '/channels/town-square';
             },
             (err) => {
                 AsyncClient.dispatchError(err, 'handleDelete');