diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
index 14fd294c..60983f47 100644
--- a/src/browser/components/SettingsPage.jsx
+++ b/src/browser/components/SettingsPage.jsx
@@ -91,6 +91,21 @@ const SettingsPage = React.createClass({
   handleCancel() {
     backToIndex();
   },
+
+  handleClose(e) {
+    let savedConfig;
+    try {
+      savedConfig = settings.readFileSync(this.props.configFile);
+    } catch (err) {
+      savedConfig = settings.loadDefault();
+    }
+    if (savedConfig.teams.length === 0) {
+      e.preventDefault();
+    } else {
+      backToIndex();
+    }
+  },
+
   handleChangeDisableWebSecurity() {
     this.setState({
       disablewebsecurity: !this.refs.disablewebsecurity.props.checked
@@ -327,7 +342,7 @@ const SettingsPage = React.createClass({
             <h1 style={settingsPage.heading}>{'Settings'}</h1>
             <div
               style={settingsPage.close}
-              onClick={this.handleCancel}
+              onClick={this.handleClose}
             >
               <span>{'×'}</span>
             </div>