diff --git a/src/undo_manager/index.js b/src/undo_manager/index.js
index da981a7e2..c86d55502 100644
--- a/src/undo_manager/index.js
+++ b/src/undo_manager/index.js
@@ -181,7 +181,7 @@ module.exports = () => {
      * um.undo();
      */
     undo() {
-      if (!em.get('Canvas').isInputFocused()) um.undo(1);
+      !em.isEditing() && um.undo(1);
       return this;
     },
 
@@ -203,7 +203,7 @@ module.exports = () => {
      * um.redo();
      */
     redo() {
-      if (!em.get('Canvas').isInputFocused()) um.redo(1);
+      !em.isEditing() && um.redo(1);
       return this;
     },