diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
index a1cc125a..4974313a 100644
--- a/src/browser/components/SettingsPage.jsx
+++ b/src/browser/components/SettingsPage.jsx
@@ -65,7 +65,7 @@ const SettingsPage = React.createClass({
       this.setState({showAddTeamForm: true});
     }
   },
-  handleSave() {
+  handleSave(index) {
     var config = {
       teams: this.state.teams,
       showTrayIcon: this.state.showTrayIcon,
@@ -93,11 +93,14 @@ const SettingsPage = React.createClass({
     ipcRenderer.send('update-menu', config);
     ipcRenderer.send('update-config');
 
-    backToIndex();
+    backToIndex(index);
   },
   handleCancel() {
     backToIndex();
   },
+  backToIndexWithSave(index) {
+    this.handleSave(index);
+  },
   handleChangeDisableWebSecurity() {
     this.setState({
       disablewebsecurity: this.refs.disablewebsecurity.props.checked
@@ -183,7 +186,7 @@ const SettingsPage = React.createClass({
             onTeamsChange={this.handleTeamsChange}
             updateTeam={this.updateTeam}
             addServer={this.addServer}
-            onTeamClick={backToIndex}
+            onTeamClick={this.backToIndexWithSave}
           />
         </Col>
       </Row>