diff --git a/src/apps/copilots/src/pages/copilot-request-form/index.tsx b/src/apps/copilots/src/pages/copilot-request-form/index.tsx
index 520a62ee2..3ae5d3068 100644
--- a/src/apps/copilots/src/pages/copilot-request-form/index.tsx
+++ b/src/apps/copilots/src/pages/copilot-request-form/index.tsx
@@ -303,6 +303,7 @@ const CopilotRequestForm: FC<{}> = () => {
                             customRadius
                             noCaps
                             leftAlignText
+                            textWrap
                         />
                         <Button
                             secondary
@@ -316,6 +317,7 @@ const CopilotRequestForm: FC<{}> = () => {
                             customRadius
                             noCaps
                             leftAlignText
+                            textWrap
                         />
                         <Button
                             secondary
@@ -329,6 +331,7 @@ const CopilotRequestForm: FC<{}> = () => {
                             customRadius
                             noCaps
                             leftAlignText
+                            textWrap
                         />
                         {formErrors.complexity && (
                             <p className={styles.error}>
diff --git a/src/libs/ui/lib/components/button/base-button/BaseButton.module.scss b/src/libs/ui/lib/components/button/base-button/BaseButton.module.scss
index 661feddbf..e608893f0 100644
--- a/src/libs/ui/lib/components/button/base-button/BaseButton.module.scss
+++ b/src/libs/ui/lib/components/button/base-button/BaseButton.module.scss
@@ -60,6 +60,12 @@ $btn-secondary-border-width: $border;
         justify-content: left;
     }
 
+    &:global(.btn-text-wrap) {
+        white-space: normal;
+        word-wrap: break-word;
+        text-align: left;
+    }
+
     // Define variants
     &:global(.btn-variant-danger) {
         --btn-variant: #{$red-120};
diff --git a/src/libs/ui/lib/components/button/base-button/BaseButton.tsx b/src/libs/ui/lib/components/button/base-button/BaseButton.tsx
index 0f44c347f..cc2417df5 100644
--- a/src/libs/ui/lib/components/button/base-button/BaseButton.tsx
+++ b/src/libs/ui/lib/components/button/base-button/BaseButton.tsx
@@ -27,6 +27,7 @@ export interface BaseButtonProps extends ButtonHTMLAttributes<HTMLButtonElement>
     customRadius?: boolean
     noCaps?: boolean
     leftAlignText?: boolean
+    textWrap?: boolean
 }
 
 const BaseButton: FC<BaseButtonProps> = props => {
@@ -47,6 +48,7 @@ const BaseButton: FC<BaseButtonProps> = props => {
         'btn-style-primary': props.primary,
         'btn-style-secondary': props.secondary,
         [`btn-variant-${props.variant}`]: !!props.variant,
+        'btn-text-wrap': props.textWrap,
     })
 
     return (