diff --git a/frontend/src/Editor/Box.jsx b/frontend/src/Editor/Box.jsx
index 75a2753b21..b8aa5d8204 100644
--- a/frontend/src/Editor/Box.jsx
+++ b/frontend/src/Editor/Box.jsx
@@ -282,6 +282,7 @@ export const Box = function Box({
         {inCanvas ? (
           !resetComponent ? (
             <ComponentToRender
+              key={`${id}${currentState.page.id}`}
               onComponentClick={onComponentClick}
               onComponentOptionChanged={onComponentOptionChanged}
               currentState={currentState}
diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
index e9d14a75eb..6588c8bc83 100644
--- a/frontend/src/Editor/Editor.jsx
+++ b/frontend/src/Editor/Editor.jsx
@@ -1622,10 +1622,10 @@ class EditorComponent extends React.Component {
     const { globals: existingGlobals } = this.state.currentState;
 
     const page = {
-      ...this.state.currentState.page,
       name,
       handle,
       variables: this.state.pages?.[pageId]?.variables ?? {},
+      id: pageId,
     };
 
     const globals = {