1 files changed, 19 insertions, 3 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 80fa0e463..7e336c994 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -325,6 +325,9 @@ const _templateFactory = intl => [
         label: intl.formatMessage(menuItems.pasteAndMatchStyle),
         accelerator: 'Cmd+Shift+V',
         selector: 'pasteAndMatchStyle:',
+        click() {
+          getActiveWebview().pasteAndMatchStyle();
+        },
       },
       {
         label: intl.formatMessage(menuItems.delete),
@@ -345,7 +348,7 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.openQuickSwitch),
-        accelerator: 'CmdOrCtrl+P',
+        accelerator: 'CmdOrCtrl+S',
         click() {
           window.ferdi.features.quickSwitch.state.isModalVisible = true;
         },
@@ -549,7 +552,7 @@ const _titleBarTemplateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.openQuickSwitch),
-        accelerator: 'CmdOrCtrl+P',
+        accelerator: 'CmdOrCtrl+S',
         click() {
           window.ferdi.features.quickSwitch.state.isModalVisible = true;
         },
@@ -783,12 +786,21 @@ export default class FranzMenu {
       accelerator: 'CmdOrCtrl+Shift+L',
       enabled: this.stores.settings.app.lockingFeatureEnabled,
       click() {
+        // Disable lock first - otherwise the application might not update correctly
         actions.settings.update({
           type: 'app',
           data: {
-            locked: true,
+            locked: false,
           },
         });
+        setTimeout(() => {
+          actions.settings.update({
+            type: 'app',
+            data: {
+              locked: true,
+            },
+          });
+        }, 0);
       },
     });
 
@@ -976,6 +988,10 @@ export default class FranzMenu {
       checked: service.isActive,
       click: () => {
         this.actions.service.setActive({ serviceId: service.id });
+
+        if (isMac && i === 0) {
+          app.mainWindow.restore();
+        }
       },
     })));