diff --git a/web/react/components/removed_from_channel_modal.jsx b/web/react/components/removed_from_channel_modal.jsx
index b815e5d1d6..a8889a92a4 100644
--- a/web/react/components/removed_from_channel_modal.jsx
+++ b/web/react/components/removed_from_channel_modal.jsx
@@ -3,24 +3,40 @@
 
 var ChannelStore = require('../stores/channel_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
+var BrowserStore = require('../stores/browser_store.jsx')
 var utils = require('../utils/utils.jsx');
 
 module.exports = React.createClass({
+    handleShow: function() {
+      var newState = {};
+      if(BrowserStore.getItem("channel-removed-state")) {
+        newState = BrowserStore.getItem("channel-removed-state");
+        BrowserStore.removeItem("channel-removed-state");
+      }
+
+      this.setState(newState);
+    },
     handleClose: function() {
       var townSquare = ChannelStore.getByName("town-square");
       utils.switchChannel(townSquare);
 
-      $(this.refs.title.getDOMNode()).text("")
-      $(this.refs.body.getDOMNode()).text("");
+      this.setState({channelName: "", remover: ""})
     },
     componentDidMount: function() {
+      $(this.getDOMNode()).on('show.bs.modal',this.handleShow);
       $(this.getDOMNode()).on('hidden.bs.modal',this.handleClose);
     },
     componentWillUnmount: function() {
+      $(this.getDOMNode()).off('show.bs.modal',this.handleShow);
       $(this.getDOMNode()).off('hidden.bs.modal',this.handleClose);
     },
+    getInitialState: function() {
+      return {channelName: "", remover: ""}
+    },
     render: function() {
-        currentUser = UserStore.getCurrentUser();
+        var currentUser = UserStore.getCurrentUser();
+        var channelName = this.state.channelName ? this.state.channelName : "the channel"
+        var remover = this.state.remover ? this.state.remover : "Someone"
 
         if (currentUser != null) {
             return (
@@ -29,10 +45,10 @@ module.exports = React.createClass({
                       <div className="modal-content">
                         <div className="modal-header">
                           <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                          <h4 ref="title" className="modal-title" />
+                          <h4 className="modal-title">Removed from {channelName}</h4>
                         </div>
                         <div className="modal-body">
-                            <p ref="body" />
+                            <p>{remover} removed you from {channelName}</p>
                         </div>
                         <div className="modal-footer">
                           <button type="button" className="btn btn-primary" data-dismiss="modal">Okay</button>
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index a29c6a9030..5b8d6c5429 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -7,6 +7,7 @@ var AsyncClient = require('../utils/async_client.jsx');
 var SocketStore = require('../stores/socket_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var TeamStore = require('../stores/team_store.jsx');
+var BrowserStore = require('../stores/browser_store.jsx')
 var utils = require('../utils/utils.jsx');
 var SidebarHeader = require('./sidebar_header.jsx');
 var SearchBox = require('./search_bar.jsx');
@@ -202,11 +203,11 @@ module.exports = React.createClass({
                 AsyncClient.getChannels(true);
 
                 if(msg.props.channel_id === ChannelStore.getCurrentId() && $('#removed_from_channel').length > 0) {
-                    var channelName = ChannelStore.getCurrent().display_name;
-                    var curUser = UserStore.getProfile(msg.props.remover).username;
-                    $('#removed_from_channel').find('.modal-title').text("Removed from " + channelName);
-                    $('#removed_from_channel').find('.modal-body').children().text(curUser + " removed you from " + channelName);
+                    var sentState = {};
+                    sentState.channelName = ChannelStore.getCurrent().display_name;
+                    sentState.remover = UserStore.getProfile(msg.props.remover).username;
 
+                    BrowserStore.setItem('channel-removed-state',sentState);
                     $('#removed_from_channel').modal('show');
                 }
             }