diff --git a/app/client/packages/design-system/ads/src/Select/Select.tsx b/app/client/packages/design-system/ads/src/Select/Select.tsx
index c99cab9010..49780c5b2f 100644
--- a/app/client/packages/design-system/ads/src/Select/Select.tsx
+++ b/app/client/packages/design-system/ads/src/Select/Select.tsx
@@ -26,6 +26,7 @@ function Select(props: SelectProps) {
     children,
     className,
     dropdownClassName,
+    dropdownMatchSelectWidth = true,
     isDisabled = false,
     isLoading = false,
     isMultiSelect,
@@ -88,6 +89,7 @@ function Select(props: SelectProps) {
         SelectDropdownClassName + `--${size}`,
         dropdownClassName,
       )}
+      dropdownMatchSelectWidth={dropdownMatchSelectWidth}
       dropdownRender={(menu: any) => {
         return (
           <div>
diff --git a/app/client/packages/design-system/ads/src/Select/Select.types.ts b/app/client/packages/design-system/ads/src/Select/Select.types.ts
index 22befed2bc..3905d97162 100644
--- a/app/client/packages/design-system/ads/src/Select/Select.types.ts
+++ b/app/client/packages/design-system/ads/src/Select/Select.types.ts
@@ -11,6 +11,7 @@ export type SelectProps = RCSelectProps & {
   isDisabled?: boolean;
   isValid?: boolean;
   isLoading?: boolean;
+  dropdownMatchSelectWidth?: boolean | number;
 };
 
 export type SelectOptionProps = OptionProps & {
diff --git a/app/client/src/IDE/Components/ToolbarSettingsPopover.tsx b/app/client/src/IDE/Components/ToolbarSettingsPopover.tsx
index d3f9fd6a02..68ce0b54e0 100644
--- a/app/client/src/IDE/Components/ToolbarSettingsPopover.tsx
+++ b/app/client/src/IDE/Components/ToolbarSettingsPopover.tsx
@@ -24,8 +24,9 @@ const StyledPopoverHeader = styled(PopoverHeader)`
 `;
 
 const StyledPopoverContent = styled(PopoverContent)<{ popoverWidth?: string }>`
-  --popover-width: ${({ popoverWidth }) =>
-    popoverWidth ? popoverWidth : "280px"};
+  min-width: 280px;
+  max-width: ${({ popoverWidth }) => (popoverWidth ? popoverWidth : "280px")};
+  width: fit-content;
 `;
 
 export const ToolbarSettingsPopover = (props: Props) => {
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx
index bffd589119..e73db4ee7d 100644
--- a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx
@@ -38,7 +38,7 @@ const StyledSelect = styled(Select)`
   width: fit-content;
 
   .rc-select-selector {
-    min-width: 120px;
+    min-width: 110px;
   }
 `;
 
@@ -100,6 +100,7 @@ const FunctionSettingRow = (props: FunctionSettingsRowProps) => {
       </FunctionName>
       <StyledSelect
         data-testid={`t--dropdown-runBehaviour`}
+        dropdownMatchSelectWidth={256}
         id={props.action.id}
         isDisabled={props.disabled}
         listHeight={240}