diff --git a/superset-frontend/src/dashboard/components/UndoRedoKeyListeners/index.jsx b/superset-frontend/src/dashboard/components/UndoRedoKeyListeners/index.jsx
index a6160dd295d0d..532eec42f2250 100644
--- a/superset-frontend/src/dashboard/components/UndoRedoKeyListeners/index.jsx
+++ b/superset-frontend/src/dashboard/components/UndoRedoKeyListeners/index.jsx
@@ -45,8 +45,10 @@ class UndoRedoKeyListeners extends React.PureComponent {
       const isYChar = event.key === 'y' || event.keyCode === 89;
       const isEditingMarkdown =
         document && document.querySelector('.dashboard-markdown--editing');
+      const isEditingTitle =
+        document && document.querySelector('.editable-title--editing');
 
-      if (!isEditingMarkdown && (isZChar || isYChar)) {
+      if (!isEditingMarkdown && !isEditingTitle && (isZChar || isYChar)) {
         event.preventDefault();
         const func = isZChar ? this.props.onUndo : this.props.onRedo;
         func();