1 files changed, 5 insertions, 3 deletions

diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index 45bca7212..b22d3ec34 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -238,7 +238,9 @@ export default class Sidebar extends React.Component {
         });
     }
 
-    handleLeaveDirectChannel(channel) {
+    handleLeaveDirectChannel(e, channel) {
+        e.preventDefault();
+
         if (!this.isLeaving.get(channel.id)) {
             this.isLeaving.set(channel.id, true);
 
@@ -258,7 +260,7 @@ export default class Sidebar extends React.Component {
         }
 
         if (channel.id === this.state.activeId) {
-            browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/town-square');
+            browserHistory.push('/' + this.state.currentTeam.name + '/channels/town-square');
         }
     }
 
@@ -422,7 +424,7 @@ export default class Sidebar extends React.Component {
                     overlay={removeTooltip}
                 >
                     <span
-                        onClick={() => handleClose(channel)}
+                        onClick={(e) => handleClose(e, channel)}
                         className='btn-close'
                     >
                         {'×'}