diff --git a/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx b/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx
index ffd987e3e..69d3b6d40 100644
--- a/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx
+++ b/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx
@@ -113,6 +113,7 @@ export const CreateSecretImportForm = ({
   return (
     <Modal isOpen={isOpen} onOpenChange={onTogglePopUp}>
       <ModalContent
+        bodyClassName="overflow-visible"
         title="Add Secret Link"
         subTitle="To inherit secrets from another environment or folder"
       >
diff --git a/frontend/src/views/SecretMainPage/components/SecretDropzone/CopySecretsFromBoard.tsx b/frontend/src/views/SecretMainPage/components/SecretDropzone/CopySecretsFromBoard.tsx
index c0c4f9a4c..ac6efe5cd 100644
--- a/frontend/src/views/SecretMainPage/components/SecretDropzone/CopySecretsFromBoard.tsx
+++ b/frontend/src/views/SecretMainPage/components/SecretDropzone/CopySecretsFromBoard.tsx
@@ -31,7 +31,10 @@ const formSchema = z.object({
     .transform((val) =>
       typeof val === "string" && val.at(-1) === "/" && val.length > 1 ? val.slice(0, -1) : val
     ),
-  secrets: z.object({ key: z.string(), value: z.string().optional() }).array().min(1)
+  secrets: z
+    .object({ key: z.string(), value: z.string().optional() })
+    .array()
+    .min(1, "Select one or more secrets to copy")
 });
 
 type TFormSchema = z.infer<typeof formSchema>;
@@ -145,6 +148,7 @@ export const CopySecretsFromBoard = ({
         </div>
       </ModalTrigger>
       <ModalContent
+        bodyClassName="overflow-visible"
         className="max-w-2xl"
         title="Copy Secret From An Environment"
         subTitle="Copy/paste secrets from other environments into this context"
@@ -185,7 +189,7 @@ export const CopySecretsFromBoard = ({
             <div className="mb-4 flex items-center justify-between">
               <div>Secrets</div>
             </div>
-            <div className="flex w-full items-center gap-3">
+            <div className="flex w-full items-start gap-3">
               <Controller
                 control={control}
                 name="secrets"
@@ -201,7 +205,7 @@ export const CopySecretsFromBoard = ({
                         isSecretsLoading
                           ? "Loading secrets..."
                           : secrets?.length
-                          ? "select secrets..."
+                          ? "Select secrets..."
                           : "No secrets found..."
                       }
                       isLoading={isSecretsLoading}
@@ -217,7 +221,7 @@ export const CopySecretsFromBoard = ({
               />
               <Tooltip content="Select All">
                 <IconButton
-                  className="mb-3.5 h-9 w-9"
+                  className="mt-1 h-9 w-9"
                   ariaLabel="Select all"
                   variant="outline_bg"
                   size="xs"