3 files changed, 15 insertions, 6 deletions

diff --git a/src/environment.js b/src/environment.js
index e185120c0..7bb2db134 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -8,7 +8,16 @@ export const isMac = process.platform === 'darwin';
 export const isWindows = process.platform === 'win32';
 export const isLinux = process.platform === 'linux';
 
-export const ctrlKey = isMac ? '⌘' : 'Ctrl';
+let ctrlShortcutKey;
+if (isMac) {
+  ctrlShortcutKey = '⌘';
+} else if (isWindows) {
+  ctrlShortcutKey = 'Ctrl';
+} else {
+  ctrlShortcutKey = 'Alt';
+}
+
+export const ctrlKey = ctrlShortcutKey;
 
 let api;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index c29cd00ae..6bbf302ca 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,7 +1,7 @@
 import { remote, shell } from 'electron';
 import { autorun, computed, observable, toJS } from 'mobx';
 
-import { isMac } from '../environment';
+import { isMac, isLinux } from '../environment';
 
 const { app, Menu, dialog } = remote;
 
@@ -133,7 +133,6 @@ export default class FranzMenu {
       },
     });
 
-
     tpl[1].submenu.unshift({
       label: 'Reload Service',
       id: 'reloadService',
@@ -277,9 +276,10 @@ export default class FranzMenu {
     const services = this.stores.services.enabled;
 
     if (this.stores.user.isLoggedIn) {
+      const systemAcceleratorKey = isLinux ? 'Alt' : 'CmdOrCtrl';
       return services.map((service, i) => ({
         label: service.name,
-        accelerator: i <= 9 ? `CmdOrCtrl+${i + 1}` : null,
+        accelerator: i <= 9 ? `${systemAcceleratorKey}+${i + 1}` : null,
         type: 'radio',
         checked: service.isActive,
         click: () => {
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 4cfe6d0b5..f608a689e 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -114,13 +114,13 @@ export default class AppStore extends Store {
 
     // Set active the next service
     key(
-      '⌘+pagedown, ctrl+pagedown, ⌘+shift+tab, ctrl+shift+tab', () => {
+      '⌘+pagedown, ctrl+pagedown, ⌘+tab, ctrl+tab', () => {
         this.actions.service.setActiveNext();
       });
 
     // Set active the prev service
     key(
-      '⌘+pageup, ctrl+pageup, ⌘+tab, ctrl+tab', () => {
+      '⌘+pageup, ctrl+pageup, ⌘+shift+tab, ctrl+shift+tab', () => {
         this.actions.service.setActivePrev();
       });