diff --git a/addons/website_event/static/src/scss/event_templates_page.scss b/addons/website_event/static/src/scss/event_templates_page.scss
index e86aeb075d3..ba4bb1c9ad5 100644
--- a/addons/website_event/static/src/scss/event_templates_page.scss
+++ b/addons/website_event/static/src/scss/event_templates_page.scss
@@ -70,6 +70,23 @@
     }
 }
 
+#modal_ticket_registration {
+    // Handle overflow behaviors.
+    #registration_form, #o_wevent_tickets, #o_wevent_tickets_collapse {
+        position: relative;
+        flex: 1 1 auto;
+        display: flex;
+        flex-direction: column;
+
+        @include media-breakpoint-up(sm) {
+            :not(.s_popup) > & {
+                overflow: auto;
+                min-height: 0;
+            }
+        }
+    }
+}
+
 /*
  * EVENT PAGE VIEW
  */
diff --git a/addons/website_event/views/event_templates_page_registration.xml b/addons/website_event/views/event_templates_page_registration.xml
index 609c63869c5..e2d775535f4 100644
--- a/addons/website_event/views/event_templates_page_registration.xml
+++ b/addons/website_event/views/event_templates_page_registration.xml
@@ -416,7 +416,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="modal-footer flex-lg-row-reverse">
+                        <div class="modal-footer flex-lg-row-reverse border-top">
                             <button type="button" class="btn btn-light" data-bs-dismiss="modal">Close</button>
                             <button type="submit" class="btn btn-primary o_wait_lazy_js a-submit" disabled="" t-attf-id="#{event.id}">
                                 Register
@@ -466,7 +466,7 @@
                                 </t>
                             </div>
                         </div>
-                        <div class="modal-footer flex-lg-row-reverse">
+                        <div class="modal-footer flex-lg-row-reverse border-top">
                             <button type="button" class="btn btn-light" data-bs-dismiss="modal">Close</button>
                             <button type="submit" class="btn btn-primary o_wait_lazy_js a-submit" t-attf-id="#{event.id}" disabled="disabled">
                                 Register