diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
index 02537904..83a0e4b1 100644
--- a/src/browser/components/SettingsPage.jsx
+++ b/src/browser/components/SettingsPage.jsx
@@ -112,13 +112,13 @@ const SettingsPage = React.createClass({
       showUnreadBadge: this.state.showUnreadBadge
     };
 
-    ipcRenderer.send('update-menu', config);
-    ipcRenderer.send('update-config');
     settings.writeFile(this.props.configFile, config, (err) => {
       if (err) {
         callback(err);
         return;
       }
+      ipcRenderer.send('update-menu', config);
+      ipcRenderer.send('update-config');
       if (process.platform === 'win32' || process.platform === 'linux') {
         const autostart = this.state.autostart;
         this.saveAutoStart(autostart, callback);
diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index ac1e0e24..e6972e59 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -86,6 +86,8 @@ function showUnreadBadge(unreadCount, mentionCount) {
 
 function teamConfigChange(teams) {
   AppConfig.set('teams', teams);
+  ipcRenderer.send('update-menu', AppConfig.data);
+  ipcRenderer.send('update-config');
 }
 
 const parsedURL = url.parse(window.location.href, true);