diff --git a/js/apps/admin-ui/src/components/dynamic/ScriptComponent.tsx b/js/apps/admin-ui/src/components/dynamic/ScriptComponent.tsx
index 2a77ddd8f2..9e58bb287d 100644
--- a/js/apps/admin-ui/src/components/dynamic/ScriptComponent.tsx
+++ b/js/apps/admin-ui/src/components/dynamic/ScriptComponent.tsx
@@ -41,7 +41,7 @@ export const ScriptComponent = ({
             isReadOnly={isDisabled}
             type="text"
             onChange={field.onChange}
-            code={field.value}
+            code={Array.isArray(field.value) ? field.value[0] : field.value}
             height="600px"
             language={Language.javascript}
           />
diff --git a/js/apps/admin-ui/src/page/PageHandler.tsx b/js/apps/admin-ui/src/page/PageHandler.tsx
index 564af4ad45..6aa7b176e3 100644
--- a/js/apps/admin-ui/src/page/PageHandler.tsx
+++ b/js/apps/admin-ui/src/page/PageHandler.tsx
@@ -67,7 +67,8 @@ export const PageHandler = ({
       if (id) {
         await adminClient.components.update({ id }, updatedComponent);
       } else {
-        await adminClient.components.create(updatedComponent);
+        const { id } = await adminClient.components.create(updatedComponent);
+        setId(id);
       }
       addAlert(t("itemSaveSuccessful"));
     } catch (error) {