diff --git a/src/main/menus/app.js b/src/main/menus/app.js
index 75ff53e9..57807a70 100644
--- a/src/main/menus/app.js
+++ b/src/main/menus/app.js
@@ -241,7 +241,7 @@ function createTemplate(mainWindow, config, isDev) {
     }, {
       role: 'close',
       accelerator: 'CmdOrCtrl+W',
-    }, separatorItem, ...teams.slice(0, 9).map((team, i) => {
+    }, separatorItem, ...teams.slice(0, 9).sort((teamA, teamB) => teamA.order - teamB.order).map((team, i) => {
       return {
         label: team.name,
         accelerator: `CmdOrCtrl+${i + 1}`,
diff --git a/src/main/menus/tray.js b/src/main/menus/tray.js
index 978b9e45..9fc75823 100644
--- a/src/main/menus/tray.js
+++ b/src/main/menus/tray.js
@@ -9,7 +9,7 @@ function createTemplate(mainWindow, config, isDev) {
   const settingsURL = isDev ? 'http://localhost:8080/browser/settings.html' : `file://${app.getAppPath()}/browser/settings.html`;
   const teams = config.teams;
   const template = [
-    ...teams.slice(0, 9).map((team, i) => {
+    ...teams.slice(0, 9).sort((teamA, teamB) => teamA.order - teamB.order).map((team, i) => {
       return {
         label: team.name,
         click: () => {