diff --git a/client/src/app/tabs/bpmn/modeler/features/properties-panel-keyboard-bindings/PropertiesPanelKeyoardBindings.js b/client/src/app/tabs/bpmn/modeler/features/properties-panel-keyboard-bindings/PropertiesPanelKeyoardBindings.js
index 6904f1b0e8..7bb86ef9d0 100644
--- a/client/src/app/tabs/bpmn/modeler/features/properties-panel-keyboard-bindings/PropertiesPanelKeyoardBindings.js
+++ b/client/src/app/tabs/bpmn/modeler/features/properties-panel-keyboard-bindings/PropertiesPanelKeyoardBindings.js
@@ -56,19 +56,27 @@ export default class PropertiesPanelKeyboardBindings {
     if (isUndo(event)) {
       commandStack.canUndo() && commandStack.undo();
 
-      event.preventDefault();
+      this._cancel(event);
     }
 
     if (isRedo(event)) {
       commandStack.canRedo() && commandStack.redo();
 
-      event.preventDefault();
+      this._cancel(event);
     }
   }
 
   _getContainer() {
     return this._propertiesPanel._container;
   }
+
+  /**
+   * @param {KeyboardEvent} event
+   */
+  _cancel(event) {
+    event.preventDefault();
+    event.stopPropagation();
+  }
 }
 
 PropertiesPanelKeyboardBindings.$inject = [ 'commandStack', 'eventBus', 'propertiesPanel' ];