diff --git a/layout-service/src/main/java/io/meeds/layout/service/NavigationLayoutService.java b/layout-service/src/main/java/io/meeds/layout/service/NavigationLayoutService.java
index 2d099da3d..80bf52e5c 100644
--- a/layout-service/src/main/java/io/meeds/layout/service/NavigationLayoutService.java
+++ b/layout-service/src/main/java/io/meeds/layout/service/NavigationLayoutService.java
@@ -150,6 +150,8 @@ public NodeData createDraftNode(Long nodeId, String username) throws ObjectNotFo
                                                   getNodeLabels(nodeId, username).getLabels()),
                         username);
     } else {
+      NodeState state = clonedNode.getState().builder().pageRef(clonedPageKey).build();
+      navigationService.updateNode(Long.parseLong(clonedNode.getId()), state);
       return navigationService.getNodeById(Long.parseLong(clonedNode.getId()));
     }
   }
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/NodeItemMenu.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/NodeItemMenu.vue
index fa55990b1..c9fd15872 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/NodeItemMenu.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/NodeItemMenu.vue
@@ -35,7 +35,7 @@
     </template>
     <v-list class="pa-0" dense>
       <v-list-item
-        v-if="canEditPage"
+        v-if="canEditPageLayout"
         class="subtitle-2" 
         @click="editLayout">
         <v-icon
@@ -234,6 +234,12 @@ export default {
     canEditPage() {
       return this.navigationNode?.canEditPage && this.pageRef;
     },
+    pageLink() {
+      return this.navigationNode?.pageLink;
+    },
+    canEditPageLayout() {
+      return this.canEditPage && !this.pageLink;
+    },
   },
   watch: {
     displayActionMenu() {
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue
index a5af68590..2f7b0cba6 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue
@@ -241,7 +241,13 @@ export default {
         this.loading = false;
       } else {
         this.loading = true;
-        this.$pageLayoutService.createPage(this.elementName, this.elementTitle, this.navigationNode.siteKey.name, this.navigationNode.siteKey.type, this.elementType, this.elementType === 'LINK' && this.link || null, this.elementType === 'PAGE' && this.pageTemplate?.id)
+        this.$pageLayoutService.createPage(
+          this.elementName,
+          this.elementTitle,
+          this.navigationNode.siteKey.name,
+          this.navigationNode.siteKey.type,
+          this.elementType, this.elementType === 'LINK' && this.link || null,
+          this.elementType === 'PAGE' && this.pageTemplate?.id || null)
           .then((createdPage) => {
             const pageRef = createdPage?.key?.ref || `${createdPage?.key.site.typeName}::${createdPage?.key.site.name}::${createdPage?.pageContext?.key.name}`;
             this.$root.$emit('save-node-with-page', {
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue
index 819c64a70..5e1083245 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue
@@ -410,7 +410,7 @@ export default {
         this.loading = true;
         this.$navigationLayoutService.updateNode(this.navigationNode.id, this.nodeLabel, pageRef, this.visible, this.isScheduled, startScheduleDate, endScheduleDate, nodeLabels?.labels, pageData?.nodeTarget || this.navigationNode.target, this.nodeIcon)
           .then(() => {
-            this.openTargetPage(pageData);
+            this.openTargetPage(pageData, this.navigationNode.id);
             this.$root.$emit('refresh-navigation-nodes');
             this.$root.$emit('close-add-element-drawer');
             this.close();
diff --git a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/LayoutEditor.vue b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/LayoutEditor.vue
index 209b0c08d..8e12dab05 100644
--- a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/LayoutEditor.vue
+++ b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/LayoutEditor.vue
@@ -56,7 +56,7 @@ export default {
       return this.getQueryParam('pageId') || this.pageKey?.ref || (this.pageKey && `${this.pageKey.site.typeName}::${this.pageKey.site.name}::${this.pageKey.name}`);
     },
     nodeId() {
-      return this.getQueryParam('nodeId');
+      return this.getQueryParam('nodeId') || (this.pageTemplateId && eXo.env.portal.selectedNodeId);
     },
     draftNodeId() {
       return this.draftNode?.id;
diff --git a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/content/Content.vue b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/content/Content.vue
index cc34d4fb2..fa50c14f7 100644
--- a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/content/Content.vue
+++ b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/content/Content.vue
@@ -152,8 +152,8 @@ export default {
     },
     setLayout(layout) {
       this.initContainer(layout);
-      this.isCompatible = this.$layoutUtils.parseSections(layout);
-      if (!this.isCompatible) {
+      const isCompatible = this.$layoutUtils.parseSections(layout);
+      if (!isCompatible) {
         const applications = this.$layoutUtils.getApplications(layout);
         layout.children = [];
         const parentContainer = this.$layoutUtils.newParentContainer(layout);
@@ -162,6 +162,7 @@ export default {
         if (applications?.length && applications?.length > 1) {
           this.$layoutUtils.newSection(parentContainer, 1, 1, 2, this.$layoutUtils.flexTemplate);
         }
+        this.isCompatible = !applications?.length;
         this.modified = true;
       }
       if (this.layoutToEdit) {