diff --git a/app/web/src/nova/ed/panel/popup/script/pop-script.tsx b/app/web/src/nova/ed/panel/popup/script/pop-script.tsx
index e1a4cae3..350ee391 100644
--- a/app/web/src/nova/ed/panel/popup/script/pop-script.tsx
+++ b/app/web/src/nova/ed/panel/popup/script/pop-script.tsx
@@ -3,7 +3,7 @@ import { jscript } from "../../../../../utils/script/jscript";
 import { Loading } from "../../../../../utils/ui/loading";
 import { Modal } from "../../../../../utils/ui/modal";
 import { EDGlobal } from "../../../logic/ed-global";
-import { propPopover } from "../../side/prop-comp/prop-form";
+import { propPopover } from "../../side/prop-master/prop-form";
 import { ScriptWorkbench } from "./workbench";
 
 export const EdPopScript = () => {
diff --git a/app/web/src/nova/ed/panel/side/prop-instance.tsx b/app/web/src/nova/ed/panel/side/prop-instance.tsx
index d22649bf..9b7b208e 100644
--- a/app/web/src/nova/ed/panel/side/prop-instance.tsx
+++ b/app/web/src/nova/ed/panel/side/prop-instance.tsx
@@ -2,10 +2,28 @@ import { FC } from "react";
 import { useGlobal } from "web-utils";
 import { EDGlobal, EdMeta, active } from "../../logic/ed-global";
 import { IItem } from "../../../../utils/types/item";
+import { FMCompDef } from "../../../../utils/types/meta-fn";
 
 export const EdSidePropInstance: FC<{ meta: EdMeta }> = ({ meta }) => {
   const p = useGlobal(EDGlobal, "EDITOR");
 
+  const item = meta?.item as IItem;
+  if (!item) return null;
+
+  let filtered = [] as FMCompDef[];
+  const mprops = meta.mitem?.get("component")?.get("props");
+  if (mprops && meta.mitem) {
+    mprops.forEach((m, key) => {
+      filtered.push(m);
+    });
+
+    filtered = filtered.sort((a, b) => {
+      const aidx = a.get("idx") || 0;
+      const bidx = b.get("idx") || 0;
+      return aidx - bidx;
+    });
+  }
+
   return (
     <div className="flex flex-col text-[12px]">
       <div className="flex border-b p-1 h-[35px] items-center bg-slate-50 justify-between select-none">
diff --git a/app/web/src/nova/ed/panel/side/prop-comp.tsx b/app/web/src/nova/ed/panel/side/prop-master.tsx
similarity index 97%
rename from app/web/src/nova/ed/panel/side/prop-comp.tsx
rename to app/web/src/nova/ed/panel/side/prop-master.tsx
index 3e049519..0fa53665 100644
--- a/app/web/src/nova/ed/panel/side/prop-comp.tsx
+++ b/app/web/src/nova/ed/panel/side/prop-master.tsx
@@ -11,8 +11,8 @@ import { useGlobal, useLocal } from "web-utils";
 import { IItem } from "../../../../utils/types/item";
 import { FMCompDef } from "../../../../utils/types/meta-fn";
 import { EDGlobal, EdMeta } from "../../logic/ed-global";
-import { EdPropCompTreeItem, PropItem } from "./prop-comp/tree-item";
-import { propPopover } from "./prop-comp/prop-form";
+import { EdPropCompTreeItem, PropItem } from "./prop-master/tree-item";
+import { propPopover } from "./prop-master/prop-form";
 
 const propRef = {
   el: null as any,
diff --git a/app/web/src/nova/ed/panel/side/prop-comp/edit-script.tsx b/app/web/src/nova/ed/panel/side/prop-master/edit-script.tsx
similarity index 100%
rename from app/web/src/nova/ed/panel/side/prop-comp/edit-script.tsx
rename to app/web/src/nova/ed/panel/side/prop-master/edit-script.tsx
diff --git a/app/web/src/nova/ed/panel/side/prop-comp/prop-form.tsx b/app/web/src/nova/ed/panel/side/prop-master/prop-form.tsx
similarity index 100%
rename from app/web/src/nova/ed/panel/side/prop-comp/prop-form.tsx
rename to app/web/src/nova/ed/panel/side/prop-master/prop-form.tsx
diff --git a/app/web/src/nova/ed/panel/side/prop-comp/tree-item.tsx b/app/web/src/nova/ed/panel/side/prop-master/tree-item.tsx
similarity index 100%
rename from app/web/src/nova/ed/panel/side/prop-comp/tree-item.tsx
rename to app/web/src/nova/ed/panel/side/prop-master/tree-item.tsx
diff --git a/app/web/src/nova/ed/panel/side/side-style.tsx b/app/web/src/nova/ed/panel/side/side-style.tsx
index bab2015f..809145f6 100644
--- a/app/web/src/nova/ed/panel/side/side-style.tsx
+++ b/app/web/src/nova/ed/panel/side/side-style.tsx
@@ -2,7 +2,7 @@ import { FC } from "react";
 import { EDGlobal, EdMeta, active } from "../../logic/ed-global";
 import { useGlobal } from "web-utils";
 import { IItem } from "../../../../utils/types/item";
-import { EdSidePropComp } from "./prop-comp";
+import { EdSidePropComp } from "./prop-master";
 
 export const EdSideStyle: FC<{ meta: EdMeta }> = ({ meta }) => {
   const p = useGlobal(EDGlobal, "EDITOR");