diff --git a/src/components/modeler/Modeler.vue b/src/components/modeler/Modeler.vue
index 5b5b67121..68f0dd7f1 100644
--- a/src/components/modeler/Modeler.vue
+++ b/src/components/modeler/Modeler.vue
@@ -712,10 +712,9 @@ export default {
         this.setShapeCenterUnderCursor(diagram);
       }
 
-      this.highlightNode(newNode);
-      await this.addNode(newNode);
-
       if (!nodeThatWillBeReplaced) {
+        await this.addNode(newNode);
+        this.highlightNode(newNode);
         return;
       }
 
@@ -729,6 +728,8 @@ export default {
       );
       nodeMigrator.migrate();
 
+      await this.addNode(newNode);
+      this.highlightNode(newNode);
       return newNode;
     },
     setShapeCenterUnderCursor(diagram) {