diff --git a/@app/client/src/styles/global.css b/@app/client/src/styles/global.css
index c303b282..41a8ec01 100644
--- a/@app/client/src/styles/global.css
+++ b/@app/client/src/styles/global.css
@@ -54,6 +54,13 @@ body {
   white-space: normal;
 }
 
+.ant-form-item .ant-form-item-label-wrap > label {
+  /* antd's labelWrap wraps the label text but keeps the label at a fixed
+     control height, so extra lines spill over adjacent fields */
+  height: auto;
+  min-height: 32px;
+}
+
 @keyframes gradient {
   0% {
     background-position: 0% 50%;
diff --git a/@app/components/src/EventRegistrationForm.tsx b/@app/components/src/EventRegistrationForm.tsx
index 18b7340a..98e46d58 100644
--- a/@app/components/src/EventRegistrationForm.tsx
+++ b/@app/components/src/EventRegistrationForm.tsx
@@ -237,6 +237,7 @@ export const EventRegistrationForm: React.FC<EventRegistrationFormProps> = memo(
         colon={false}
         form={form}
         initialValues={initialValues}
+        labelWrap
         onFinish={handleSubmit}
       >
         <Form.Item