diff --git a/web/app/components/base/form/components/field/custom-select.tsx b/web/app/components/base/form/components/field/custom-select.tsx
index 08e2cdc43777c1..ce5c7c4415c7de 100644
--- a/web/app/components/base/form/components/field/custom-select.tsx
+++ b/web/app/components/base/form/components/field/custom-select.tsx
@@ -25,12 +25,15 @@ const CustomSelectField = <T extends Option>({
     <div className={cn('flex flex-col gap-y-0.5', className)}>
       <Label
         htmlFor={field.name}
-        label={label}
-        {...(labelOptions ?? {})}
-      />
-      <CustomSelect<T>
         value={field.state.value}
         options={options}
+        onChange={value => field.handleChange(value)}
+        popupProps={{
+          wrapperClassName: 'z-[1000]',
+        }}
+        {...selectProps}
+      />
+    </div>
         onChange={value => field.handleChange(value)}
         {...selectProps}
       />