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 df77c3106..325cb08b3 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
@@ -363,7 +363,10 @@ export default {
               this.pageToEdit = page;
               this.elementType = page.state?.type === 'LINK' && 'LINK' || 'existingPage';
               this.link = page?.state?.link;
-              this.$root.$emit('set-selected-page', page.state);
+              this.$nextTick()
+                .then(() => {
+                  this.$root.$emit('set-selected-page', page);
+                });
             });
         } else {
           this.elementType = 'Group';
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationPageSuggester.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationPageSuggester.vue
index feb28afa9..ca452bd50 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationPageSuggester.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationPageSuggester.vue
@@ -181,8 +181,11 @@ export default {
       }, this.endTypingKeywordTimeout);
     },
     emitSelectedValue(value) {
-      this.selectedPage = value;
-      this.pages.push(this.selectedPage);
+      this.selectedPage = {
+        pageRef: `${ value?.key?.site?.typeName}::${ value?.key?.site?.name}::${value?.key?.name}`,
+        displayName: value?.state?.displayName || value?.key.name,
+      };
+      this.pages.push(value);
     },
   }
 };