diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts
index 3e6657afd0..b129d73e37 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts
@@ -508,7 +508,7 @@ describe("JS to non-JS mode in Action Selector", () => {
     propPane.ToggleJSMode("onClick");
     propPane.ValidatePropertyFieldValue(
       "onClick",
-      `{{copyToClipboard('line1\\nline2\\nline3a');}}`,
+      `{{copyToClipboard('aline1\\nline2\\nline3');}}`,
     );
   });
 
diff --git a/app/client/src/components/editorComponents/ActionCreator/Field/index.tsx b/app/client/src/components/editorComponents/ActionCreator/Field/index.tsx
index e250d0ba00..7d35a6ef3f 100644
--- a/app/client/src/components/editorComponents/ActionCreator/Field/index.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/Field/index.tsx
@@ -217,6 +217,7 @@ export function Field(props: FieldProps) {
         },
         value: value,
         additionalAutoComplete: props.additionalAutoComplete,
+        dataTreePath: props.dataTreePath,
       });
       break;
     case FieldType.CALLBACK_FUNCTION_API_AND_QUERY:
@@ -235,6 +236,7 @@ export function Field(props: FieldProps) {
         },
         value: value,
         additionalAutoComplete: props.additionalAutoComplete,
+        dataTreePath: props.dataTreePath,
       });
       break;
     default:
diff --git a/app/client/src/components/editorComponents/ActionCreator/FieldGroup/index.tsx b/app/client/src/components/editorComponents/ActionCreator/FieldGroup/index.tsx
index 2e4c47f92f..5d80eb4bd1 100644
--- a/app/client/src/components/editorComponents/ActionCreator/FieldGroup/index.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/FieldGroup/index.tsx
@@ -79,6 +79,7 @@ function FieldGroup(props: FieldGroupProps) {
               <li key={index}>
                 <FieldGroup
                   additionalAutoComplete={props.additionalAutoComplete}
+                  dataTreePath={props.dataTreePath}
                   integrationOptions={props.integrationOptions}
                   key={selectorField.label + index}
                   label={selectorField.label}
diff --git a/app/client/src/components/editorComponents/ActionCreator/index.tsx b/app/client/src/components/editorComponents/ActionCreator/index.tsx
index 724b2239e7..1bf8856bfa 100644
--- a/app/client/src/components/editorComponents/ActionCreator/index.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/index.tsx
@@ -274,6 +274,7 @@ const ActionCreator = React.forwardRef(
           {Object.entries(actions).map(([id, value], index) => (
             <Action
               code={value}
+              dataTreePath={props.dataTreePath}
               id={id}
               index={index}
               key={id}
diff --git a/app/client/src/components/editorComponents/ActionCreator/types.ts b/app/client/src/components/editorComponents/ActionCreator/types.ts
index 6ba49fac98..5dd14e86f3 100644
--- a/app/client/src/components/editorComponents/ActionCreator/types.ts
+++ b/app/client/src/components/editorComponents/ActionCreator/types.ts
@@ -52,6 +52,7 @@ export type TextViewProps = ViewProps & {
   index?: number;
   additionalAutoComplete?: AdditionalDynamicDataTree;
   toolTip?: string;
+  dataTreePath?: string | undefined;
 };
 
 export type TabViewProps = Omit<ViewProps, "get" | "set"> & SwitcherProps;
@@ -77,6 +78,7 @@ export type ActionCreatorProps = {
   propertyName: string;
   widgetType: string;
   widgetName: string;
+  dataTreePath: string | undefined;
 };
 
 export type Field = {
@@ -114,6 +116,7 @@ export type FieldProps = {
   navigateToSwitches: Array<SwitchType>;
   activeTabApiAndQueryCallback: SwitchType;
   apiAndQueryCallbackTabSwitches: SwitchType[];
+  dataTreePath?: string | undefined;
 };
 
 export type FieldGroupProps = Omit<
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx
index cd1015828b..aacc686a1c 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx
@@ -23,6 +23,7 @@ export default function ActionSelector(props: {
   open: boolean;
   id: string;
   level: number;
+  dataTreePath: string | undefined;
   onChange: (actionBlock: TActionBlock, del?: boolean) => void;
 }) {
   const action = props.action;
@@ -43,7 +44,13 @@ export default function ActionSelector(props: {
     <Popover2
       canEscapeKeyClose
       className="w-full"
-      content={<ActionSelectorForm action={action} onChange={props.onChange} />}
+      content={
+        <ActionSelectorForm
+          action={action}
+          dataTreePath={props.dataTreePath}
+          onChange={props.onChange}
+        />
+      }
       isOpen={props.open}
       minimal
       popoverClassName={popoverClassName}
@@ -60,6 +67,7 @@ type TActionSelectorFormProps = {
   action: TActionBlock;
   onChange: (actionBlock: TActionBlock, del?: boolean) => void;
   additionalAutoComplete?: AdditionalDynamicDataTree;
+  dataTreePath: string | undefined;
 };
 
 const pathClassList = [
@@ -176,6 +184,7 @@ function ActionSelectorForm(props: TActionSelectorFormProps) {
       <div className="p-3 pt-0">
         <FieldGroup
           additionalAutoComplete={additionalAutoComplete}
+          dataTreePath={props.dataTreePath}
           integrationOptions={integrationOptions}
           isChainedAction={isChainedAction}
           modalDropdownList={modalDropdownList}
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.test.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.test.tsx
index e875ad49ac..d1f7c62a2e 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.test.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.test.tsx
@@ -26,6 +26,7 @@ describe("tests for Action Tree in Action Selector", () => {
         <ThemeProvider theme={lightTheme}>
           <ActionTree
             actionBlock={actionBlock}
+            dataTreePath=""
             id="xyz"
             level={0}
             onChange={() => {
@@ -59,6 +60,7 @@ describe("tests for Action Tree in Action Selector", () => {
         <ThemeProvider theme={lightTheme}>
           <ActionTree
             actionBlock={actionBlock}
+            dataTreePath=""
             id="xyz"
             level={0}
             onChange={() => {
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
index 9e5b5f44e6..7907c81dae 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
@@ -53,6 +53,7 @@ export default function ActionTree(props: {
   widgetName: string;
   propertyName: string;
   widgetType: string;
+  dataTreePath: string | undefined;
 }) {
   const { id } = props;
   const [actionBlock, setActionBlock] = React.useState(props.actionBlock);
@@ -175,6 +176,7 @@ export default function ActionTree(props: {
     <div className={props.className}>
       <ActionSelector
         action={actionBlock}
+        dataTreePath={props.dataTreePath}
         id={id}
         level={props.level}
         onChange={props.onChange}
@@ -258,6 +260,7 @@ export default function ActionTree(props: {
                       <ActionTree
                         actionBlock={cActionBlock}
                         className="mt-0"
+                        dataTreePath={props.dataTreePath}
                         id={`${id}_${blockType}_${index}`}
                         isLastBlock={index === callbacks.length - 1}
                         key={`${id}_${blockType}_${index}`}
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/index.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/index.tsx
index 93734f6c52..3db232e361 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/index.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/index.tsx
@@ -12,6 +12,7 @@ type TRootActionProps = {
   propertyName: string;
   widgetName: string;
   widgetType: string;
+  dataTreePath: string | undefined;
 };
 
 export default function Action(props: TRootActionProps) {
@@ -41,6 +42,7 @@ export default function Action(props: TRootActionProps) {
     <ActionTree
       actionBlock={action}
       className={`${props.index === 0 ? "mt-1" : "mt-2"}`}
+      dataTreePath={props.dataTreePath}
       id={id}
       level={0}
       onChange={handleChange}
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/TextView/index.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/TextView/index.tsx
index f69a56f45e..750dba1c52 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/TextView/index.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/TextView/index.tsx
@@ -64,6 +64,7 @@ export function TextView(props: TextViewProps) {
         )}
         <InputText
           additionalAutocomplete={props.additionalAutoComplete}
+          dataTreePath={props.dataTreePath}
           evaluatedValue={value}
           expected={{
             type: "string",
diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx
index 8f5bfc8662..6a2eb86e91 100644
--- a/app/client/src/components/editorComponents/CodeEditor/index.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx
@@ -1525,7 +1525,8 @@ class CodeEditor extends Component<Props, State> {
       evaluated = evaluatedValue;
 
     if (dataTreePath) {
-      evaluated = pathEvaluatedValue;
+      evaluated =
+        pathEvaluatedValue !== undefined ? pathEvaluatedValue : evaluated;
     }
     const entityInformation = this.getEntityInformation();
 
diff --git a/app/client/src/components/propertyControls/ActionSelectorControl.tsx b/app/client/src/components/propertyControls/ActionSelectorControl.tsx
index 36dcf4d0fa..8fa14a121b 100644
--- a/app/client/src/components/propertyControls/ActionSelectorControl.tsx
+++ b/app/client/src/components/propertyControls/ActionSelectorControl.tsx
@@ -61,7 +61,13 @@ class ActionSelectorControl extends BaseControl<ControlProps> {
   };
 
   render() {
-    const { label, propertyName, propertyValue, widgetProperties } = this.props;
+    const {
+      dataTreePath,
+      label,
+      propertyName,
+      propertyValue,
+      widgetProperties,
+    } = this.props;
 
     return (
       <ActionCreator
@@ -70,6 +76,7 @@ class ActionSelectorControl extends BaseControl<ControlProps> {
         additionalControlData={
           this.props.additionalControlData as Record<string, any>
         }
+        dataTreePath={dataTreePath}
         onValueChange={this.handleValueUpdate}
         propertyName={propertyName}
         ref={this.componentRef}
diff --git a/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx b/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx
index e909236f82..c202dcafdb 100644
--- a/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx
+++ b/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx
@@ -60,6 +60,7 @@ class ColumnActionSelectorControl extends BaseControl<ColumnActionSelectorContro
                   <ActionCreator
                     action={this.props.label}
                     additionalControlData={{}}
+                    dataTreePath=""
                     onValueChange={this.updateColumnActionFunction.bind(
                       this,
                       columnAction,