Merge pull request #151 from meetfranz/feature/shortcuts

Improve shortcuts

1 files changed, 3 insertions, 3 deletions

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: () => {