diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/SourceInput.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/SourceInput.tsx
index 8113d1eef..b6a05cef5 100644
--- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/SourceInput.tsx
+++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/SourceInput.tsx
@@ -27,8 +27,8 @@ export function SourceInput({
   const isFocused = useMemo(
     () =>
       rightSide === EnumRightType.AddSonataProp &&
-      isEqual(item, rightSideInfo?.previousData),
-    [rightSide, item, rightSideInfo?.previousData]
+      isEqual(item.id, rightSideInfo?.previousData?.id),
+    [rightSide, item.id, rightSideInfo?.previousData?.id]
   );
 
   const handleChange = (changes: { [field in keyof typeof item]?: any }) => {
@@ -42,6 +42,12 @@ export function SourceInput({
     }
 
     setRequestMapping(newRequest);
+    if (isFocused && rightSideInfo) {
+      setRightSideInfo({
+        ...rightSideInfo,
+        previousData: newRequest[index],
+      });
+    }
   };
   return (
     <Flex className={styles.flexColumn} gap={4}>
diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/TargetInput.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/TargetInput.tsx
index ba091ea2a..0a345d2a4 100644
--- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/TargetInput.tsx
+++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/TargetInput.tsx
@@ -44,6 +44,12 @@ export function TargetInput({
     }
 
     setRequestMapping(newRequest);
+    if (isFocused && rightSideInfo) {
+      setRightSideInfo({
+        ...rightSideInfo,
+        previousData: newRequest[index],
+      });
+    }
   };
   return (
     <Flex className={styles.flexColumn} gap={4}>
diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/index.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/index.tsx
index fc592e0f8..5c88258a2 100644
--- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/index.tsx
+++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RequestItem/index.tsx
@@ -233,7 +233,6 @@ const RequestItem = ({ item, index }: Props) => {
       setRequestMapping(newRequest);
     }
   }, [continuousInput]);
-
   return (
     <div
       className={clsx([
diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/ResponseItem/SourceInput.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/ResponseItem/SourceInput.tsx
index 210006292..26da39c19 100644
--- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/ResponseItem/SourceInput.tsx
+++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/ResponseItem/SourceInput.tsx
@@ -37,7 +37,6 @@ export function SourceInput({
   const id = `${index}-${item?.name}`;
   const isFocused =
     rightSide === EnumRightType.AddSellerResponse && activeResponseName === id;
-
   return (
     <Flex className={styles.flexColumn} gap={4}>
       {item.source ? (
diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/ResponseItem/TargetInput.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/ResponseItem/TargetInput.tsx
index a542a53cf..d464f7f05 100644
--- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/ResponseItem/TargetInput.tsx
+++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/ResponseItem/TargetInput.tsx
@@ -29,7 +29,6 @@ export function TargetInput({
 
   const isFocused =
     rightSide === EnumRightType.SonataResponse && activeSonataResponse === id;
-
   return (
     <Flex className={styles.flexColumn} gap={4}>
       {item.target ? (
diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSellerProp/index.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSellerProp/index.tsx
index 03308a4b0..710835445 100644
--- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSellerProp/index.tsx
+++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSellerProp/index.tsx
@@ -46,7 +46,6 @@ const RightAddSellerProp = ({ onSelect }: Readonly<Props>) => {
       styles.treeValue
     );
   }, [sellerApi]);
-
   const { handleAddProp, collapseItems } = useCommonAddProp({
     selectedProp,
     rightSideInfo,
diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSonataProp/index.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSonataProp/index.tsx
index 13b816b5d..b7c54e44f 100644
--- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSonataProp/index.tsx
+++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSonataProp/index.tsx
@@ -88,7 +88,6 @@ const RightAddSonataProp = ({
       styles.treeValue
     );
   }, [correctSpec]);
-
   const { handleAddProp, collapseItems } = useCommonAddProp({
     selectedProp,
     rightSideInfo,
@@ -98,7 +97,7 @@ const RightAddSonataProp = ({
     setSelectedProp,
     onSelect,
   });
-
+ 
   return (
     <Flex
       vertical
diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/SonataPropMapping/index.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/SonataPropMapping/index.tsx
index 5ac771410..1ba02a3a1 100644
--- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/SonataPropMapping/index.tsx
+++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/SonataPropMapping/index.tsx
@@ -80,7 +80,7 @@ const SonataPropMapping = ({ list, title }: Readonly<Props>) => {
     setRightSideInfo(undefined);
   }
 
-  const notEmptyList = !!list.length
+  const notEmptyList = !!list.length;
   return (
     <Flex gap={16}>
       <div className={styles.sonataPropMappingWrapper}>