diff --git a/frontend/src/Editor/Container.jsx b/frontend/src/Editor/Container.jsx
index 6dd8846dab..7c76656116 100644
--- a/frontend/src/Editor/Container.jsx
+++ b/frontend/src/Editor/Container.jsx
@@ -121,6 +121,11 @@ export const Container = ({
     [isContainerFocused, appDefinition, focusedParentIdRef]
   );
 
+  useEffect(() => {
+    setBoxes(components);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [JSON.stringify(components)]);
+
   useEffect(() => {
     const handleClick = (e) => {
       if (canvasRef.current.contains(e.target) || document.getElementById('modal-container')?.contains(e.target)) {
diff --git a/frontend/src/Editor/EditorFunc.jsx b/frontend/src/Editor/EditorFunc.jsx
index df11bf5dc5..53be7f2ef7 100644
--- a/frontend/src/Editor/EditorFunc.jsx
+++ b/frontend/src/Editor/EditorFunc.jsx
@@ -491,7 +491,6 @@ const EditorComponent = (props) => {
 
   //! Needs attention
   const handleEvent = (eventName, event, options) => {
-    console.log('--------arpit handleEvent:::', { eventName, event, options });
     return onEvent(editorRef, eventName, event, options, 'edit');
   };
 
@@ -981,7 +980,7 @@ const EditorComponent = (props) => {
         );
       } else {
         childComponents = Object.keys(newDefinition.pages[currentPageId].components).filter(
-          (key) => newDefinition.pages[currentPageId].components[key].parent === componentId
+          (key) => newDefinition.pages[currentPageId].components[key].component.parent === componentId
         );
       }
 
diff --git a/frontend/src/Editor/Inspector/EventManager.jsx b/frontend/src/Editor/Inspector/EventManager.jsx
index ee849ab85c..ca6ef895c4 100644
--- a/frontend/src/Editor/Inspector/EventManager.jsx
+++ b/frontend/src/Editor/Inspector/EventManager.jsx
@@ -830,18 +830,9 @@ export const EventManager = ({
         index: index,
       };
     });
-    console.log('----arpit reorder events:: ', { result, events, reorderedEvents });
+
     setEvents(result);
 
-    // updateAppVersionEventHandlers(
-    //   [
-    //     {
-    //       event_id: updatedEvent.id,
-    //       diff: updatedEvent,
-    //     },
-    //   ],
-    //   'update'
-    // );
     updateAppVersionEventHandlers(
       reorderedEvents.map((event) => ({
         event_id: event.id,
diff --git a/frontend/src/_stores/appDataStore.js b/frontend/src/_stores/appDataStore.js
index 0e69c7a4ef..91ec391963 100644
--- a/frontend/src/_stores/appDataStore.js
+++ b/frontend/src/_stores/appDataStore.js
@@ -35,20 +35,23 @@ export const useAppDataStore = create(
         updateState: (state) => set((prev) => ({ ...prev, ...state })),
         updateAppDefinitionDiff: (appDefinitionDiff) => set(() => ({ appDefinitionDiff: appDefinitionDiff })),
         updateAppVersion: (appId, versionId, pageId, appDefinitionDiff, isUserSwitchedVersion = false) => {
-          useAppDataStore.getState().actions.setIsSaving(true);
-          appVersionService
-            .autoSaveApp(
-              appId,
-              versionId,
-              appDefinitionDiff.updateDiff,
-              appDefinitionDiff.type,
-              pageId,
-              appDefinitionDiff.operation,
-              isUserSwitchedVersion
-            )
-            .then(() => {
-              useAppDataStore.getState().actions.setIsSaving(false);
-            });
+          return new Promise((resolve) => {
+            useAppDataStore.getState().actions.setIsSaving(true);
+            appVersionService
+              .autoSaveApp(
+                appId,
+                versionId,
+                appDefinitionDiff.updateDiff,
+                appDefinitionDiff.type,
+                pageId,
+                appDefinitionDiff.operation,
+                isUserSwitchedVersion
+              )
+              .then(() => {
+                useAppDataStore.getState().actions.setIsSaving(false);
+              })
+              .finally(() => resolve());
+          });
         },
         updateAppVersionEventHandlers: async (events, updateType = 'update') => {
           useAppDataStore.getState().actions.setIsSaving(true);