diff --git a/internal_packages/composer/keymaps/composer.json b/internal_packages/composer/keymaps/composer.json
index 807fc3364..3a3120ac5 100644
--- a/internal_packages/composer/keymaps/composer.json
+++ b/internal_packages/composer/keymaps/composer.json
@@ -4,8 +4,6 @@
   "composer:show-and-focus-bcc": "mod+shift+b",
   "composer:show-and-focus-from": "mod+shift+f",
   "composer:send-message": "mod+enter",
-  "composer:undo": "mod+z",
-  "composer:redo": "mod+y",
   "composer:no-op": "delete",
   "composer:delete-empty-draft": "escape"
 }
diff --git a/internal_packages/composer/lib/composer-view.jsx b/internal_packages/composer/lib/composer-view.jsx
index 97db1cae7..30591d6fe 100644
--- a/internal_packages/composer/lib/composer-view.jsx
+++ b/internal_packages/composer/lib/composer-view.jsx
@@ -108,8 +108,8 @@ export default class ComposerView extends React.Component {
       'composer:show-and-focus-cc': () => this.refs.header.showAndFocusField(Fields.Cc),
       'composer:focus-to': () => this.refs.header.showAndFocusField(Fields.To),
       "composer:show-and-focus-from": () => {}, // todo
-      "composer:undo": this.undo,
-      "composer:redo": this.redo,
+      "core:undo": this.undo,
+      "core:redo": this.redo,
     };
   }
 
diff --git a/keymaps/base.json b/keymaps/base.json
index 4708a739d..983613087 100644
--- a/keymaps/base.json
+++ b/keymaps/base.json
@@ -1,6 +1,6 @@
 {
   "core:undo": "mod+z",
-  "core:redo": "mod+y",
+  "core:redo": ["mod+shift+z", "mod+y"],
   "core:cut": "mod+x",
   "core:copy": "mod+c",
   "core:paste": "mod+v",