diff --git a/app/web/src/nova/ed/panel/popup/page/page-popup.tsx b/app/web/src/nova/ed/panel/popup/page/page-popup.tsx
index b8df2ae3..dcc83179 100644
--- a/app/web/src/nova/ed/panel/popup/page/page-popup.tsx
+++ b/app/web/src/nova/ed/panel/popup/page/page-popup.tsx
@@ -175,7 +175,7 @@ export const EdPopPage = () => {
                               id: opt.dragSourceId as string,
                             },
                             data: {
-                              parent_id: (opt.dropTargetId === "ROOT" ||
+                              parent_id: (opt.dropTargetId === "root" ||
                               !opt.dropTargetId
                                 ? null
                                 : opt.dropTargetId) as string,
diff --git a/app/web/src/nova/ed/panel/popup/page/page-reload.ts b/app/web/src/nova/ed/panel/popup/page/page-reload.ts
index 82e9f98d..8ee552ca 100644
--- a/app/web/src/nova/ed/panel/popup/page/page-reload.ts
+++ b/app/web/src/nova/ed/panel/popup/page/page-reload.ts
@@ -17,7 +17,8 @@ export const pagePicker = {
   status: "ready" as "loading" | "ready",
   search: "",
   render: () => {},
-  rename_id: ""
+  rename_id: "",
+  new_parent_id: ""
 };
 
 export const reloadPagePicker = async (p: PG) => {
diff --git a/app/web/src/nova/ed/panel/popup/page/page-tree.tsx b/app/web/src/nova/ed/panel/popup/page/page-tree.tsx
index 9ac3238c..a2da117a 100644
--- a/app/web/src/nova/ed/panel/popup/page/page-tree.tsx
+++ b/app/web/src/nova/ed/panel/popup/page/page-tree.tsx
@@ -76,9 +76,12 @@ export const edPageTreeRender: NodeRender<PageItem> = (
                       data: {
                         name: local.rename_to,
                         id_site: p.site.id,
-                        parent_id: validate(rename_id) ? rename_id : null,
+                        parent_id: validate(pagePicker.new_parent_id)
+                          ? pagePicker.new_parent_id
+                          : null,
                       },
                     });
+                    pagePicker.new_parent_id = "";
                   }
                 } else {
                   await db.page_folder.update({
@@ -126,7 +129,9 @@ export const edPageTreeRender: NodeRender<PageItem> = (
                         type: "folder",
                       },
                     });
+
                     pagePicker.rename_id = "NEW";
+                    pagePicker.new_parent_id = item.id;
                     p.render();
                   }}
                 >
diff --git a/app/web/src/render/editor/panel/manager/page/page-mgr.tsx b/app/web/src/render/editor/panel/manager/page/page-mgr.tsx
index 0d6a46f0..7132f77c 100644
--- a/app/web/src/render/editor/panel/manager/page/page-mgr.tsx
+++ b/app/web/src/render/editor/panel/manager/page/page-mgr.tsx
@@ -251,14 +251,16 @@ export const PageManager = () => {
                   data.pages = newTree;
                   local.render();
 
+                  const is_drop_root =
+                    opt.dropTargetId === "ROOT" || opt.dropTargetId === "root";
+
                   if (!opt.dragSource?.droppable) {
                     await db.page.update({
                       where: {
                         id: opt.dragSourceId as string,
                       },
                       data: {
-                        id_folder: (opt.dropTargetId === "ROOT" ||
-                        !opt.dropTargetId
+                        id_folder: (is_drop_root || !opt.dropTargetId
                           ? null
                           : opt.dropTargetId) as string,
                       },
@@ -270,8 +272,7 @@ export const PageManager = () => {
                         id: opt.dragSourceId as string,
                       },
                       data: {
-                        parent_id: (opt.dropTargetId === "ROOT" ||
-                        !opt.dropTargetId
+                        parent_id: (is_drop_root || !opt.dropTargetId
                           ? null
                           : opt.dropTargetId) as string,
                       },
@@ -643,11 +644,9 @@ const Elbow = () => (
     xmlns="http://www.w3.org/2000/svg"
     width={10}
     height={10}
-    className={cx(
-      css`
-        opacity: 0.3;
-      `
-    )}
+    className={cx(css`
+      opacity: 0.3;
+    `)}
     fill="none"
     viewBox="0 0 15 15"
   >
diff --git a/dockerzip b/dockerzip
index dcb2709e..3b55090e 100644
Binary files a/dockerzip and b/dockerzip differ