1 files changed, 7 insertions, 4 deletions
diff --git a/web/react/components/rename_team_modal.jsx b/web/react/components/rename_team_modal.jsx
index 79836e4a8..dfd775a3b 100644
--- a/web/react/components/rename_team_modal.jsx
+++ b/web/react/components/rename_team_modal.jsx
@@ -44,11 +44,14 @@ module.exports = React.createClass({
     onNameChange: function() {
         this.setState({ name: this.refs.name.getDOMNode().value })
     },
+    handleClose: function() {
+        this.setState({ name: this.props.teamDisplayName, name_error: "", server_error: ""});
+    },
     componentDidMount: function() {
-        var self = this;
-        $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function(e) {
-            self.setState({ name: self.props.teamDisplayName, name_error: "", server_error: ""});
-        });
+        $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', this.handleClose);
+    },
+    componentWillUnmount: function() {
+        $(this.refs.modal.getDOMNode()).off('hidden.bs.modal', this.handleClose);
     },
     getInitialState: function() {
         return { name: this.props.teamDisplayName };