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 d79256e4..cc2fc57f 100644
--- a/app/web/src/nova/ed/panel/side/prop-instance.tsx
+++ b/app/web/src/nova/ed/panel/side/prop-instance.tsx
@@ -176,6 +176,7 @@ export const EdSidePropInstance: FC<{ meta: IMeta }> = ({ meta }) => {
                       mprop={mprop}
                       name={name}
                       labelClick={labelClick}
+                      onEditCode={createEditScript(p, "value", mprop, name)}
                     />
                   </>
                 ) : (
diff --git a/app/web/src/nova/ed/panel/side/prop-instance/edit-script.tsx b/app/web/src/nova/ed/panel/side/prop-instance/edit-script.tsx
index 5133f0e3..7233b087 100644
--- a/app/web/src/nova/ed/panel/side/prop-instance/edit-script.tsx
+++ b/app/web/src/nova/ed/panel/side/prop-instance/edit-script.tsx
@@ -8,7 +8,7 @@ export const createEditScript = (
   mprop: FMCompDef,
   name: string
 ) => {
-  return ((e) => {
+  return (e: any) => {
     e.preventDefault();
     e.stopPropagation();
 
@@ -21,5 +21,5 @@ export const createEditScript = (
       p.ui.popup.script.prop_name = name;
       p.render();
     }
-  }) as MouseEventHandler<HTMLButtonElement>;
+  };
 };
diff --git a/app/web/src/nova/ed/panel/side/prop-instance/prop-code.tsx b/app/web/src/nova/ed/panel/side/prop-instance/prop-code.tsx
index 587e428a..7bb7a7bf 100644
--- a/app/web/src/nova/ed/panel/side/prop-instance/prop-code.tsx
+++ b/app/web/src/nova/ed/panel/side/prop-instance/prop-code.tsx
@@ -8,7 +8,8 @@ export const EdPropInstanceCode: FC<{
   name: string;
   mprop: FMCompDef;
   labelClick?: React.MouseEventHandler<HTMLDivElement> | undefined;
-}> = ({ name, labelClick }) => {
+  onEditCode: React.MouseEventHandler<HTMLDivElement> | undefined;
+}> = ({ name, labelClick, onEditCode }) => {
   const p = useGlobal(EDGlobal, "EDITOR");
   return (
     <div className="flex items-center min-h-[28px]">
@@ -16,21 +17,7 @@ export const EdPropInstanceCode: FC<{
       <div className="flex-1 flex justify-end pr-1">
         <div
           className="m-1 px-1 bg-white cursor-pointer hover:bg-blue-500 hover:text-white hover:border-blue-500 font-mono border border-slate-300 text-[11px] select-none"
-          onClick={() => {
-            p.ui.popup.script.prop_name = name;
-            p.ui.popup.script.type = "prop-instance";
-            p.ui.popup.script.prop_kind = "value";
-            p.ui.popup.script.open = true;
-
-            if (active.instance.item_id && active.comp_id) {
-              active.item_id = active.instance.item_id;
-              active.comp_id = active.instance.comp_id;
-              active.instance.item_id = "";
-              active.instance.comp_id = "";
-            }
-
-            p.render();
-          }}
+          onClick={onEditCode}
         >
           EDIT CODE
         </div>