diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6874f95e15..648b889499 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ All notable changes to the [Camunda Modeler](https://github.com/camunda/camunda-
 
 ___Note:__ Yet to be released changes appear here._
 
+* `DEPS`: update to `camunda-bpmn-js@5.4.2`
+
 ## 5.31.0
 
 ### General
diff --git a/client/package.json b/client/package.json
index a91a5d6ec2..b34e428079 100644
--- a/client/package.json
+++ b/client/package.json
@@ -28,12 +28,12 @@
     "@ibm/plex": "^6.4.1",
     "@sentry/browser": "^8.0.0",
     "@sentry/integrations": "^7.108.0",
-    "bpmn-js": "^18.1.1",
+    "bpmn-js": "^18.1.2",
     "bpmn-js-element-templates": "^2.4.0",
     "bpmn-js-properties-panel": "^5.30.0",
     "bpmn-js-tracking": "^0.6.0",
     "bpmn-moddle": "^9.0.1",
-    "camunda-bpmn-js": "^5.4.1",
+    "camunda-bpmn-js": "^5.4.2",
     "camunda-bpmn-moddle": "^7.0.1",
     "camunda-cmmn-moddle": "^1.0.0",
     "camunda-dmn-js": "^3.0.0",
@@ -44,7 +44,7 @@
     "cmmn-js-properties-panel": "^0.9.0",
     "codemirror": "^6.0.1",
     "debug": "^4.1.1",
-    "diagram-js": "^15.2.3",
+    "diagram-js": "^15.2.4",
     "diagram-js-direct-editing": "^3.2.0",
     "diagram-js-origin": "^1.4.0",
     "dmn-js": "^17.0.3",
diff --git a/client/src/app/tabs/bpmn/modeler/BpmnModeler.js b/client/src/app/tabs/bpmn/modeler/BpmnModeler.js
index 82cc2ee806..52e38f6c99 100644
--- a/client/src/app/tabs/bpmn/modeler/BpmnModeler.js
+++ b/client/src/app/tabs/bpmn/modeler/BpmnModeler.js
@@ -59,7 +59,10 @@ export default class PlatformBpmnModeler extends BpmnModeler {
       ...otherOptions,
       additionalModules,
       moddleExtensions,
-      disableAdjustOrigin: Flags.get(DISABLE_ADJUST_ORIGIN)
+      disableAdjustOrigin: Flags.get(DISABLE_ADJUST_ORIGIN),
+      canvas: {
+        autoFocus: true
+      }
     });
   }
 }
diff --git a/client/src/app/tabs/cloud-bpmn/modeler/BpmnModeler.js b/client/src/app/tabs/cloud-bpmn/modeler/BpmnModeler.js
index c656728a52..3a8da5ed6d 100644
--- a/client/src/app/tabs/cloud-bpmn/modeler/BpmnModeler.js
+++ b/client/src/app/tabs/cloud-bpmn/modeler/BpmnModeler.js
@@ -61,7 +61,10 @@ export default class CloudBpmnModeler extends BpmnModeler {
       ...otherOptions,
       additionalModules,
       moddleExtensions,
-      disableAdjustOrigin: Flags.get(DISABLE_ADJUST_ORIGIN)
+      disableAdjustOrigin: Flags.get(DISABLE_ADJUST_ORIGIN),
+      canvas: {
+        autoFocus: true
+      }
     });
   }
 }
diff --git a/client/src/app/tabs/cloud-dmn/modeler/DmnModeler.js b/client/src/app/tabs/cloud-dmn/modeler/DmnModeler.js
index fa509043c8..855022d20d 100644
--- a/client/src/app/tabs/cloud-dmn/modeler/DmnModeler.js
+++ b/client/src/app/tabs/cloud-dmn/modeler/DmnModeler.js
@@ -99,6 +99,9 @@ export default class CamundaDmnModeler extends DmnModeler {
       moddleExtensions: {
         ...moddleExtensions,
         modeler: modelerModdle
+      },
+      canvas: {
+        autoFocus: true
       }
     });
 
diff --git a/client/src/app/tabs/dmn/modeler/DmnModeler.js b/client/src/app/tabs/dmn/modeler/DmnModeler.js
index 55e46f99fd..d05642ae02 100644
--- a/client/src/app/tabs/dmn/modeler/DmnModeler.js
+++ b/client/src/app/tabs/dmn/modeler/DmnModeler.js
@@ -99,6 +99,9 @@ export default class CamundaDmnModeler extends DmnModeler {
       moddleExtensions: {
         ...moddleExtensions,
         modeler: modelerModdle
+      },
+      canvas: {
+        autoFocus: true
       }
     });
 
diff --git a/package-lock.json b/package-lock.json
index 4708f09ecf..0e1d4976f0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -113,12 +113,12 @@
         "@ibm/plex": "^6.4.1",
         "@sentry/browser": "^8.0.0",
         "@sentry/integrations": "^7.108.0",
-        "bpmn-js": "^18.1.1",
+        "bpmn-js": "^18.1.2",
         "bpmn-js-element-templates": "^2.4.0",
         "bpmn-js-properties-panel": "^5.30.0",
         "bpmn-js-tracking": "^0.6.0",
         "bpmn-moddle": "^9.0.1",
-        "camunda-bpmn-js": "^5.4.1",
+        "camunda-bpmn-js": "^5.4.2",
         "camunda-bpmn-moddle": "^7.0.1",
         "camunda-cmmn-moddle": "^1.0.0",
         "camunda-dmn-js": "^3.0.0",
@@ -129,7 +129,7 @@
         "cmmn-js-properties-panel": "^0.9.0",
         "codemirror": "^6.0.1",
         "debug": "^4.1.1",
-        "diagram-js": "^15.2.3",
+        "diagram-js": "^15.2.4",
         "diagram-js-direct-editing": "^3.2.0",
         "diagram-js-origin": "^1.4.0",
         "dmn-js": "^17.0.3",
@@ -11184,13 +11184,13 @@
       "optional": true
     },
     "node_modules/bpmn-js": {
-      "version": "18.1.1",
-      "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.1.1.tgz",
-      "integrity": "sha512-7LN+f7y1u4FtbI/6lI3Elf2phEBa0RVr0YJZrSG46RyiHU9wY5NR2n9OIqKeuGJq1RJ/YMowMoUNDIBdmb9zbg==",
+      "version": "18.1.2",
+      "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.1.2.tgz",
+      "integrity": "sha512-GtD/Zyu5foh+S74/PNNBs0ys1yiQb6LSuQjbUIzsCssNkbI/3IJH9k7y7AdRrZFoci+oFSeCRTwSCldZSPMpKw==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "bpmn-moddle": "^9.0.1",
-        "diagram-js": "^15.2.3",
+        "diagram-js": "^15.2.4",
         "diagram-js-direct-editing": "^3.2.0",
         "ids": "^1.0.5",
         "inherits-browser": "^0.1.0",
@@ -12052,9 +12052,9 @@
       }
     },
     "node_modules/camunda-bpmn-js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/camunda-bpmn-js/-/camunda-bpmn-js-5.4.1.tgz",
-      "integrity": "sha512-t0/8TrQtPiT+vprhzOQg6anxx0KGca9L1AYQrneflA1Uo5KfkBnMMF3RS426Etv/QpRxYy4tjqNOR0XDHPM+QA==",
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/camunda-bpmn-js/-/camunda-bpmn-js-5.4.2.tgz",
+      "integrity": "sha512-Ok2xv0jX5im9ssJjTJO2PV/XVe+svEQVi+2TNRsrmFhuqNHA5Chlxuuj9s4TYhqVCZc/ofqJrRccRjwLYB34FQ==",
       "license": "MIT",
       "dependencies": {
         "@bpmn-io/align-to-origin": "^0.7.0",
@@ -12064,14 +12064,14 @@
         "@bpmn-io/properties-panel": "^3.25.1",
         "@bpmn-io/variable-resolver": "^1.3.2",
         "@camunda/example-data-properties-provider": "^1.2.1",
-        "bpmn-js": "^18.1.1",
+        "bpmn-js": "^18.1.2",
         "bpmn-js-color-picker": "^0.7.1",
         "bpmn-js-create-append-anything": "^0.5.2",
         "bpmn-js-element-templates": "^2.4.0",
         "bpmn-js-executable-fix": "^0.2.1",
         "camunda-bpmn-js-behaviors": "^1.9.0",
         "camunda-bpmn-moddle": "^7.0.1",
-        "diagram-js": "^15.2.3",
+        "diagram-js": "^15.2.4",
         "diagram-js-grid": "^1.1.0",
         "diagram-js-minimap": "^5.2.0",
         "diagram-js-origin": "^1.4.0",
@@ -14474,9 +14474,9 @@
       "license": "MIT"
     },
     "node_modules/diagram-js": {
-      "version": "15.2.3",
-      "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.2.3.tgz",
-      "integrity": "sha512-C7MM5D7D0x6F5KsPzGmIPL/O9VoglTFSGrDnQNiFIA0SldC6WCwx/0nG9nS4Pwjtf7QeccaozF7FD1NAMHFs5Q==",
+      "version": "15.2.4",
+      "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.2.4.tgz",
+      "integrity": "sha512-8v0U8AY6a5Vd6Cys5MdN7+yYRhs294/Q4ixkER/3v2ZPSbVCnK9XfbeYbB5QQfoCMkBnY7WBbLbcjvRNHTxnpw==",
       "license": "MIT",
       "dependencies": {
         "@bpmn-io/diagram-js-ui": "^0.2.3",
@@ -40365,12 +40365,12 @@
       "optional": true
     },
     "bpmn-js": {
-      "version": "18.1.1",
-      "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.1.1.tgz",
-      "integrity": "sha512-7LN+f7y1u4FtbI/6lI3Elf2phEBa0RVr0YJZrSG46RyiHU9wY5NR2n9OIqKeuGJq1RJ/YMowMoUNDIBdmb9zbg==",
+      "version": "18.1.2",
+      "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.1.2.tgz",
+      "integrity": "sha512-GtD/Zyu5foh+S74/PNNBs0ys1yiQb6LSuQjbUIzsCssNkbI/3IJH9k7y7AdRrZFoci+oFSeCRTwSCldZSPMpKw==",
       "requires": {
         "bpmn-moddle": "^9.0.1",
-        "diagram-js": "^15.2.3",
+        "diagram-js": "^15.2.4",
         "diagram-js-direct-editing": "^3.2.0",
         "ids": "^1.0.5",
         "inherits-browser": "^0.1.0",
@@ -41003,9 +41003,9 @@
       }
     },
     "camunda-bpmn-js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/camunda-bpmn-js/-/camunda-bpmn-js-5.4.1.tgz",
-      "integrity": "sha512-t0/8TrQtPiT+vprhzOQg6anxx0KGca9L1AYQrneflA1Uo5KfkBnMMF3RS426Etv/QpRxYy4tjqNOR0XDHPM+QA==",
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/camunda-bpmn-js/-/camunda-bpmn-js-5.4.2.tgz",
+      "integrity": "sha512-Ok2xv0jX5im9ssJjTJO2PV/XVe+svEQVi+2TNRsrmFhuqNHA5Chlxuuj9s4TYhqVCZc/ofqJrRccRjwLYB34FQ==",
       "requires": {
         "@bpmn-io/align-to-origin": "^0.7.0",
         "@bpmn-io/element-template-chooser": "^1.0.0",
@@ -41014,14 +41014,14 @@
         "@bpmn-io/properties-panel": "^3.25.1",
         "@bpmn-io/variable-resolver": "^1.3.2",
         "@camunda/example-data-properties-provider": "^1.2.1",
-        "bpmn-js": "^18.1.1",
+        "bpmn-js": "^18.1.2",
         "bpmn-js-color-picker": "^0.7.1",
         "bpmn-js-create-append-anything": "^0.5.2",
         "bpmn-js-element-templates": "^2.4.0",
         "bpmn-js-executable-fix": "^0.2.1",
         "camunda-bpmn-js-behaviors": "^1.9.0",
         "camunda-bpmn-moddle": "^7.0.1",
-        "diagram-js": "^15.2.3",
+        "diagram-js": "^15.2.4",
         "diagram-js-grid": "^1.1.0",
         "diagram-js-minimap": "^5.2.0",
         "diagram-js-origin": "^1.4.0",
@@ -41161,13 +41161,13 @@
         "@testing-library/react": "^12.0.0",
         "babel-loader": "^9.2.1",
         "babel-plugin-istanbul": "^7.0.0",
-        "bpmn-js": "^18.1.1",
+        "bpmn-js": "^18.1.2",
         "bpmn-js-element-templates": "^2.4.0",
         "bpmn-js-properties-panel": "^5.30.0",
         "bpmn-js-tracking": "^0.6.0",
         "bpmn-moddle": "^9.0.1",
         "bpmnlint-loader": "^0.1.6",
-        "camunda-bpmn-js": "^5.4.1",
+        "camunda-bpmn-js": "^5.4.2",
         "camunda-bpmn-moddle": "^7.0.1",
         "camunda-cmmn-moddle": "^1.0.0",
         "camunda-dmn-js": "^3.0.0",
@@ -41184,7 +41184,7 @@
         "css-loader": "^7.1.2",
         "debug": "^4.1.1",
         "del-cli": "^6.0.0",
-        "diagram-js": "^15.2.3",
+        "diagram-js": "^15.2.4",
         "diagram-js-direct-editing": "^3.2.0",
         "diagram-js-origin": "^1.4.0",
         "dmn-js": "^17.0.3",
@@ -43242,9 +43242,9 @@
       "dev": true
     },
     "diagram-js": {
-      "version": "15.2.3",
-      "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.2.3.tgz",
-      "integrity": "sha512-C7MM5D7D0x6F5KsPzGmIPL/O9VoglTFSGrDnQNiFIA0SldC6WCwx/0nG9nS4Pwjtf7QeccaozF7FD1NAMHFs5Q==",
+      "version": "15.2.4",
+      "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.2.4.tgz",
+      "integrity": "sha512-8v0U8AY6a5Vd6Cys5MdN7+yYRhs294/Q4ixkER/3v2ZPSbVCnK9XfbeYbB5QQfoCMkBnY7WBbLbcjvRNHTxnpw==",
       "requires": {
         "@bpmn-io/diagram-js-ui": "^0.2.3",
         "clsx": "^2.1.0",