diff --git a/src/main/mainWindow.js b/src/main/mainWindow.js
index 1f05409f..89bb6234 100644
--- a/src/main/mainWindow.js
+++ b/src/main/mainWindow.js
@@ -114,6 +114,21 @@ function createMainWindow(config, options) {
     mainWindow.webContents.send('focus-on-webview');
   });
 
+  // Register keyboard shortcuts
+  mainWindow.webContents.on('before-input-event', (event, input) => {
+    // Add Alt+Cmd+(Right|Left) as alternative to switch between servers
+    if (process.platform === 'darwin') {
+      if (input.alt && input.meta) {
+        if (input.key === 'ArrowRight') {
+          mainWindow.webContents.send('select-next-tab');
+        }
+        if (input.key === 'ArrowLeft') {
+          mainWindow.webContents.send('select-previous-tab');
+        }
+      }
+    }
+  });
+
   return mainWindow;
 }
 
diff --git a/src/main/menus/app.js b/src/main/menus/app.js
index 96a721a8..359d0308 100644
--- a/src/main/menus/app.js
+++ b/src/main/menus/app.js
@@ -187,14 +187,14 @@ function createTemplate(mainWindow, config, isDev) {
       };
     }), separatorItem, {
       label: 'Select Next Server',
-      accelerator: (process.platform === 'darwin') ? 'Alt+Cmd+Right' : 'CmdOrCtrl+Tab',
+      accelerator: 'Ctrl+Tab',
       click() {
         mainWindow.webContents.send('select-next-tab');
       },
       enabled: (config.teams.length > 1)
     }, {
       label: 'Select Previous Server',
-      accelerator: (process.platform === 'darwin') ? 'Alt+Cmd+Left' : 'CmdOrCtrl+Shift+Tab',
+      accelerator: 'Ctrl+Shift+Tab',
       click() {
         mainWindow.webContents.send('select-previous-tab');
       },