diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js
index cc169eac09..d259b9197a 100644
--- a/packages/bbui/src/Actions/position_dropdown.js
+++ b/packages/bbui/src/Actions/position_dropdown.js
@@ -35,7 +35,10 @@ export default function positionDropdown(element, opts) {
     }
 
     if (typeof customUpdate === "function") {
-      styles = customUpdate(anchorBounds, elementBounds, styles)
+      styles = customUpdate(anchorBounds, elementBounds, {
+        ...styles,
+        offset: opts.offset,
+      })
     } else {
       // Determine vertical styles
       if (align === "right-outside") {
diff --git a/packages/builder/src/components/design/settings/controls/EditComponentPopover/EditComponentPopover.svelte b/packages/builder/src/components/design/settings/controls/EditComponentPopover/EditComponentPopover.svelte
index 5bbbfa283c..39e4bc2ada 100644
--- a/packages/builder/src/components/design/settings/controls/EditComponentPopover/EditComponentPopover.svelte
+++ b/packages/builder/src/components/design/settings/controls/EditComponentPopover/EditComponentPopover.svelte
@@ -86,6 +86,7 @@
   showPopover={drawers.length === 0}
   clickOutsideOverride={drawers.length > 0}
   maxHeight={600}
+  offset={18}
   handlePostionUpdate={customPositionHandler}
 >
   <span class="popover-wrap">
diff --git a/packages/builder/src/components/design/settings/controls/EditComponentPopover/index.js b/packages/builder/src/components/design/settings/controls/EditComponentPopover/index.js
index a32a1cd821..2dc3f60185 100644
--- a/packages/builder/src/components/design/settings/controls/EditComponentPopover/index.js
+++ b/packages/builder/src/components/design/settings/controls/EditComponentPopover/index.js
@@ -1,8 +1,8 @@
 export const customPositionHandler = (anchorBounds, eleBounds, cfg) => {
-  let { left, top } = cfg
+  let { left, top, offset } = cfg
   let percentageOffset = 30
   // left-outside
-  left = anchorBounds.left - eleBounds.width - 18
+  left = anchorBounds.left - eleBounds.width - (offset || 5)
 
   // shift up from the anchor, if space allows
   let offsetPos = Math.floor(eleBounds.height / 100) * percentageOffset
diff --git a/packages/builder/src/components/portal/onboarding/TourPopover.svelte b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
index 6dd7fa96ee..732ee40e11 100644
--- a/packages/builder/src/components/portal/onboarding/TourPopover.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
@@ -95,7 +95,7 @@
       anchor={popoverAnchor}
       maxWidth={300}
       dismissible={false}
-      offset={15}
+      offset={12}
       handlePostionUpdate={tourStep?.positionHandler}
       customZindex={3}
     >