diff --git a/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js b/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js
index 5309a5d501ec02f3c27ab942b6622597cd39a51e..dc8d0b63dedb1678b81f286fcc00bf8a08e89661 100644
--- a/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js
+++ b/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js
@@ -27,13 +27,19 @@ const backSpace = chainCommands(
   selectNodeBackward
 );
 
-const addInputRulebackSpace = (state, dispatch, view) =>
+const backSpaceShortCut = (state, dispatch, view) =>
   backSpace(
     state,
     tr => dispatch(tr.setMeta("inputType", "deleteContentBackward")),
     view
   );
 
+const undoShortCut = (state, dispatch, view) =>
+  undo(state, tr => dispatch(tr.setMeta("inputType", "historyUndo")), view);
+
+const redoShortCut = (state, dispatch, view) =>
+  redo(state, tr => dispatch(tr.setMeta("inputType", "historyRedo")), view);
+
 @injectable()
 class ShortCuts {
   constructor(plugins, schema) {
@@ -79,10 +85,10 @@ class ShortCuts {
 
   getKeys() {
     return {
-      "Mod-z": undo,
-      "Shift-Mod-z": redo,
-      Backspace: addInputRulebackSpace,
-      "Mod-y": redo,
+      "Mod-z": undoShortCut,
+      "Shift-Mod-z": redoShortCut,
+      Backspace: backSpaceShortCut,
+      "Mod-y": redoShortCut,
       Escape: selectParentNode,
       "Mod-Enter": chainCommands(exitCode, this.insertBreak),
       "Shift-Enter": chainCommands(exitCode, this.insertBreak),