diff --git a/app/client/src/IDE/Structure/Toolbar.tsx b/app/client/src/IDE/Structure/Toolbar.tsx
index bd2f4f0ce7aa..ad727adec36d 100644
--- a/app/client/src/IDE/Structure/Toolbar.tsx
+++ b/app/client/src/IDE/Structure/Toolbar.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import { Flex } from "@appsmith/ads";
 
 interface ToolbarProps {
@@ -6,14 +6,44 @@ interface ToolbarProps {
 }
 
 const Toolbar = (props: ToolbarProps) => {
+  useEffect(function detectScrollbar() {
+    const ele = document.getElementById("uqi-editor-form-content");
+    const toolbar = document.getElementById("action-toolbar");
+
+    const handleScroll = function () {
+      if (ele && ele.scrollTop > 0) {
+        toolbar?.style.setProperty(
+          "box-shadow",
+          "0 4px 6px rgba(0, 0, 0, 0.1)",
+        );
+      } else {
+        toolbar?.style.setProperty("box-shadow", "none");
+      }
+    };
+
+    if (ele) {
+      ele.addEventListener("scroll", handleScroll);
+    }
+
+    return function cleanup() {
+      ele?.removeEventListener("scroll", handleScroll);
+    };
+  }, []);
+
   return (
     <Flex
       alignItems="center"
-      borderBottom="1px solid var(--ads-v2-color-border-muted);"
       flexDirection="row"
       height="32px"
+      id="action-toolbar"
       justifyContent="space-between"
       padding="spaces-2"
+      style={{
+        transition: "box-shadow 0.3s ease",
+        position: "sticky",
+        top: 0,
+      }}
+      zIndex="10"
     >
       {props.children}
     </Flex>
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
index e5be9eb367ec..a50b3d0d4dcf 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
@@ -12,7 +12,7 @@ const PluginActionForm = () => {
   const { plugin } = usePluginActionContext();
 
   return (
-    <Flex flex="1" overflow="hidden" p="spaces-4" w="100%">
+    <Flex flex="1" overflow="hidden" p="spaces-4" pt="spaces-0" w="100%">
       {plugin.uiComponent === UIComponentTypes.ApiEditorForm && (
         <APIEditorForm />
       )}
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/styles.module.css b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/styles.module.css
index 0af35a6d69c7..aa1be4dafcc3 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/styles.module.css
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/styles.module.css
@@ -67,5 +67,11 @@
   & :global(.ads-v2-select > .rc-select-selector) {
     min-width: unset;
   }
+
+  /* Remove this once the config in DB is updated to use Section and Zone (Twilio, Airtable) */
+  & :global(.ar-form-info-text) {
+    max-width: unset;
+  }
+
   /* Removable section ends here */
 }
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/UQIEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/UQIEditorForm.tsx
index 44750c91be8a..1e7537d79b2d 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/UQIEditorForm.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/UQIEditorForm.tsx
@@ -22,7 +22,13 @@ const UQIEditorForm = () => {
   const { data, evaluationState } = useFormData();
 
   return (
-    <Flex flexDirection="column" overflowY="scroll" w="100%">
+    <Flex
+      alignItems="center"
+      flexDirection="column"
+      id="uqi-editor-form-content"
+      overflowY="scroll"
+      w="100%"
+    >
       <FormRender
         editorConfig={editorConfig}
         formData={data}
diff --git a/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx b/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
index c8e638796926..193d727addea 100644
--- a/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
+++ b/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
@@ -32,6 +32,9 @@ export const StyledFormInfo = styled.span<{ config?: ControlProps }>`
       ? "5px"
       : "0px"};
   line-height: 16px;
+  max-width: 270px;
+  overflow: hidden;
+  break-word: break-all;
 `;
 
 const FormSubtitleText = styled.span<{ config?: ControlProps }>`
@@ -177,7 +180,9 @@ function FormLabel(props: FormLabelProps) {
 //Wrapper on styled <span/>
 function FormInfoText(props: FormLabelProps) {
   return (
-    <StyledFormInfo config={props.config}>{props.children}</StyledFormInfo>
+    <StyledFormInfo className="ar-form-info-text" config={props.config}>
+      {props.children}
+    </StyledFormInfo>
   );
 }