diff --git a/modules/backend/controllers/editorpreferences/index.htm b/modules/backend/controllers/editorpreferences/index.htm
index 26ec34f6e..25be31fb9 100644
--- a/modules/backend/controllers/editorpreferences/index.htm
+++ b/modules/backend/controllers/editorpreferences/index.htm
@@ -38,8 +38,7 @@
                     type="submit"
                     data-request="onSave"
                     data-request-data="redirect:0"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
diff --git a/modules/backend/controllers/groups/create.htm b/modules/backend/controllers/groups/create.htm
index 5f9bd728a..62f852781 100644
--- a/modules/backend/controllers/groups/create.htm
+++ b/modules/backend/controllers/groups/create.htm
@@ -17,8 +17,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.create')) ?>
@@ -27,8 +26,7 @@
                     type="button"
                     data-request="onSave"
                     data-request-data="close:1"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.create_and_close')) ?>
diff --git a/modules/backend/controllers/groups/update.htm b/modules/backend/controllers/groups/update.htm
index 2e42cf76e..b5d8e4019 100644
--- a/modules/backend/controllers/groups/update.htm
+++ b/modules/backend/controllers/groups/update.htm
@@ -18,8 +18,7 @@
                     type="submit"
                     data-request="onSave"
                     data-request-data="redirect:0"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
@@ -28,8 +27,7 @@
                     type="button"
                     data-request="onSave"
                     data-request-data="close:1"
-                    data-hotkey="ctrl+enter"
-                    data-hotkey-mac="cmd+enter"
+                    data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
diff --git a/modules/backend/controllers/users/create.htm b/modules/backend/controllers/users/create.htm
index 89e408a25..828987baa 100644
--- a/modules/backend/controllers/users/create.htm
+++ b/modules/backend/controllers/users/create.htm
@@ -17,8 +17,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.create')) ?>
@@ -27,8 +26,7 @@
                     type="button"
                     data-request="onSave"
                     data-request-data="close:1"
-                    data-hotkey="ctrl+enter"
-                    data-hotkey-mac="cmd+enter"
+                    data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.create_and_close')) ?>
diff --git a/modules/backend/controllers/users/myaccount.htm b/modules/backend/controllers/users/myaccount.htm
index 900caefb1..32578229e 100644
--- a/modules/backend/controllers/users/myaccount.htm
+++ b/modules/backend/controllers/users/myaccount.htm
@@ -11,8 +11,7 @@
                     type="submit"
                     data-request="onSave"
                     data-request-data="redirect:0"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
@@ -21,8 +20,7 @@
                     type="button"
                     data-request="onSave"
                     data-request-data="close:1"
-                    data-hotkey="ctrl+enter"
-                    data-hotkey-mac="cmd+enter"
+                    data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
diff --git a/modules/backend/controllers/users/update.htm b/modules/backend/controllers/users/update.htm
index fa37d400e..aa3a486a9 100644
--- a/modules/backend/controllers/users/update.htm
+++ b/modules/backend/controllers/users/update.htm
@@ -18,8 +18,7 @@
                     type="submit"
                     data-request="onSave"
                     data-request-data="redirect:0"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
@@ -28,8 +27,7 @@
                     type="button"
                     data-request="onSave"
                     data-request-data="close:1"
-                    data-hotkey="ctrl+enter"
-                    data-hotkey-mac="cmd+enter"
+                    data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
diff --git a/modules/cms/controllers/index/_content_toolbar.htm b/modules/cms/controllers/index/_content_toolbar.htm
index 89d3d6045..dd4301287 100644
--- a/modules/cms/controllers/index/_content_toolbar.htm
+++ b/modules/cms/controllers/index/_content_toolbar.htm
@@ -4,8 +4,7 @@
         class="btn btn-primary oc-icon-check save"
         data-request="onSave"
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-        data-hotkey="ctrl+s"
-        data-hotkey-mac="cmd+s">
+        data-hotkey="ctrl+s, cmd+s">
         <?= e(trans('backend::lang.form.save')) ?>
     </a>
 
diff --git a/modules/cms/controllers/index/_layout_toolbar.htm b/modules/cms/controllers/index/_layout_toolbar.htm
index 97b9eab7f..64f64c188 100644
--- a/modules/cms/controllers/index/_layout_toolbar.htm
+++ b/modules/cms/controllers/index/_layout_toolbar.htm
@@ -4,8 +4,7 @@
         class="btn btn-primary oc-icon-check save"
         data-request="onSave"
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-        data-hotkey="ctrl+s"
-        data-hotkey-mac="cmd+s">
+        data-hotkey="ctrl+s, cmd+s">
         <?= e(trans('backend::lang.form.save')) ?>
     </a>
 
diff --git a/modules/cms/controllers/index/_page_toolbar.htm b/modules/cms/controllers/index/_page_toolbar.htm
index ef0e64b07..4deee99d4 100644
--- a/modules/cms/controllers/index/_page_toolbar.htm
+++ b/modules/cms/controllers/index/_page_toolbar.htm
@@ -4,8 +4,7 @@
         class="btn btn-primary oc-icon-check save"
         data-request="onSave"
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-        data-hotkey="ctrl+s"
-        data-hotkey-mac="cmd+s">
+        data-hotkey="ctrl+s, cmd+s">
         <?= e(trans('backend::lang.form.save')) ?>
     </a>
 
diff --git a/modules/cms/controllers/index/_partial_toolbar.htm b/modules/cms/controllers/index/_partial_toolbar.htm
index 8b0cc791f..ca66da4aa 100644
--- a/modules/cms/controllers/index/_partial_toolbar.htm
+++ b/modules/cms/controllers/index/_partial_toolbar.htm
@@ -4,8 +4,7 @@
         class="btn btn-primary oc-icon-check save"
         data-request="onSave"
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-        data-hotkey="ctrl+s"
-        data-hotkey-mac="cmd+s">
+        data-hotkey="ctrl+s, cmd+s">
         <?= e(trans('backend::lang.form.save')) ?>
     </a>
 
diff --git a/modules/system/controllers/maillayouts/create.htm b/modules/system/controllers/maillayouts/create.htm
index f80a520ca..4347511fa 100644
--- a/modules/system/controllers/maillayouts/create.htm
+++ b/modules/system/controllers/maillayouts/create.htm
@@ -16,8 +16,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="Creating Layout..."
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.create')) ?>
@@ -26,8 +25,7 @@
                     type="button"
                     data-request="onSave"
                     data-request-data="close:1"
-                    data-hotkey="ctrl+enter"
-                    data-hotkey-mac="cmd+enter"
+                    data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="Creating Layout..."
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.create_and_close')) ?>
diff --git a/modules/system/controllers/maillayouts/update.htm b/modules/system/controllers/maillayouts/update.htm
index 5d04756d6..52599fddb 100644
--- a/modules/system/controllers/maillayouts/update.htm
+++ b/modules/system/controllers/maillayouts/update.htm
@@ -26,8 +26,7 @@
                     type="submit"
                     data-request="onSave"
                     data-request-data="redirect:0"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="Saving Layout..."
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
@@ -36,8 +35,7 @@
                     type="button"
                     data-request="onSave"
                     data-request-data="close:1"
-                    data-hotkey="ctrl+enter"
-                    data-hotkey-mac="cmd+enter"
+                    data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="Saving Layout..."
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
diff --git a/modules/system/controllers/mailtemplates/create.htm b/modules/system/controllers/mailtemplates/create.htm
index 3583bdf31..db42fd5c4 100644
--- a/modules/system/controllers/mailtemplates/create.htm
+++ b/modules/system/controllers/mailtemplates/create.htm
@@ -16,8 +16,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="Creating Template..."
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.create')) ?>
@@ -26,8 +25,7 @@
                     type="button"
                     data-request="onSave"
                     data-request-data="close:1"
-                    data-hotkey="ctrl+enter"
-                    data-hotkey-mac="cmd+enter"
+                    data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="Creating Template..."
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.create_and_close')) ?>
diff --git a/modules/system/controllers/mailtemplates/update.htm b/modules/system/controllers/mailtemplates/update.htm
index e84c120fa..61a06871c 100644
--- a/modules/system/controllers/mailtemplates/update.htm
+++ b/modules/system/controllers/mailtemplates/update.htm
@@ -26,8 +26,7 @@
                     type="submit"
                     data-request="onSave"
                     data-request-data="redirect:0"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="Saving Template..."
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
@@ -36,8 +35,7 @@
                     type="button"
                     data-request="onSave"
                     data-request-data="close:1"
-                    data-hotkey="ctrl+enter"
-                    data-hotkey-mac="cmd+enter"
+                    data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="Saving Template..."
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
diff --git a/modules/system/controllers/settings/update.htm b/modules/system/controllers/settings/update.htm
index a7198ba4a..1232d9320 100644
--- a/modules/system/controllers/settings/update.htm
+++ b/modules/system/controllers/settings/update.htm
@@ -10,8 +10,7 @@
                     type="submit"
                     data-request="onSave"
                     data-request-data="redirect:0"
-                    data-hotkey="ctrl+s"
-                    data-hotkey-mac="cmd+s"
+                    data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
@@ -20,8 +19,7 @@
                     type="button"
                     data-request="onSave"
                     data-request-data="close:1"
-                    data-hotkey="ctrl+enter"
-                    data-hotkey-mac="cmd+enter"
+                    data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>