diff --git a/ocg-server/static/js/dashboard/community/team-add-member.js b/ocg-server/static/js/dashboard/community/team-add-member.js
index 0a8c3db48..ff3ca26ba 100644
--- a/ocg-server/static/js/dashboard/community/team-add-member.js
+++ b/ocg-server/static/js/dashboard/community/team-add-member.js
@@ -242,7 +242,7 @@ export class TeamAddMember extends LitWrapper {
           @click=${() => this._close()}
         ></div>
         <div class="modal-panel p-4 max-w-3xl">
-          <div class="modal-card rounded-lg">
+          <div class="modal-card rounded-lg modal-overflow-visible">
             <div class="flex items-center justify-between p-4 md:p-5 border-b border-stone-200 rounded-t">
               <h3 class="text-xl font-semibold text-stone-900">Add member</h3>
               <button
@@ -254,7 +254,7 @@ export class TeamAddMember extends LitWrapper {
                 <span class="sr-only">Close modal</span>
               </button>
             </div>
-            <div class="modal-body p-4 md:p-8">
+            <div class="modal-body p-4 md:p-8 modal-overflow-visible">
               <form
                 id="team-add-form"
                 hx-post="/dashboard/${this.dashboardType}/team/add"
diff --git a/ocg-server/static/js/dashboard/event/cfs-submissions.js b/ocg-server/static/js/dashboard/event/cfs-submissions.js
index 7e3da2c65..84819ee0b 100644
--- a/ocg-server/static/js/dashboard/event/cfs-submissions.js
+++ b/ocg-server/static/js/dashboard/event/cfs-submissions.js
@@ -1147,11 +1147,11 @@ if (!customElements.get("review-submission-modal")) {
 }
 
 const initializeCfsSubmissions = () => {
-  if (!document.body || document.body.dataset[DATA_KEY] === "true") {
+  if (document.documentElement.dataset[DATA_KEY] === "true") {
     return;
   }
-  document.body.dataset[DATA_KEY] = "true";
-  document.body.addEventListener("htmx:afterSwap", (event) => {
+  document.documentElement.dataset[DATA_KEY] = "true";
+  document.addEventListener("htmx:afterSwap", (event) => {
     const target = event?.detail?.target || event?.detail?.elt;
     if (!(target instanceof Element) || target.id !== SUBMISSIONS_CONTENT_ID) {
       return;
@@ -1165,7 +1165,7 @@ const initializeCfsSubmissions = () => {
     modal.syncLabelsFromFilter();
   });
 
-  document.body.addEventListener("click", (event) => {
+  document.addEventListener("click", (event) => {
     if (!(event.target instanceof Element)) {
       return;
     }
diff --git a/ocg-server/static/js/dashboard/group/attendees.js b/ocg-server/static/js/dashboard/group/attendees.js
index f4ae1788f..5f0fbc8fd 100644
--- a/ocg-server/static/js/dashboard/group/attendees.js
+++ b/ocg-server/static/js/dashboard/group/attendees.js
@@ -357,8 +357,6 @@ const initializeAttendeesFeatures = (root = document) => {
 
 initializeAttendeesFeatures();
 
-if (document.body) {
-  document.body.addEventListener("htmx:load", (event) => {
-    initializeAttendeesFeatures(event.target || document);
-  });
-}
+document.addEventListener("htmx:load", (event) => {
+  initializeAttendeesFeatures(event.target || document);
+});
diff --git a/ocg-server/static/js/dashboard/group/members.js b/ocg-server/static/js/dashboard/group/members.js
index 873062377..7bf7eec2f 100644
--- a/ocg-server/static/js/dashboard/group/members.js
+++ b/ocg-server/static/js/dashboard/group/members.js
@@ -20,6 +20,4 @@ const initializeMembersNotification = () => {
 
 initializeMembersNotification();
 
-if (document.body) {
-  document.body.addEventListener("htmx:load", initializeMembersNotification);
-}
+document.addEventListener("htmx:load", initializeMembersNotification);
diff --git a/ocg-server/static/js/dashboard/group/sponsors.js b/ocg-server/static/js/dashboard/group/sponsors.js
index fe78c799d..0f82bd48b 100644
--- a/ocg-server/static/js/dashboard/group/sponsors.js
+++ b/ocg-server/static/js/dashboard/group/sponsors.js
@@ -107,8 +107,6 @@ const initializeSponsorsFeatures = (root = document) => {
 
 initializeSponsorsFeatures();
 
-if (document.body) {
-  document.body.addEventListener("htmx:load", (event) => {
-    initializeSponsorsFeatures(event.target || document);
-  });
-}
+document.addEventListener("htmx:load", (event) => {
+  initializeSponsorsFeatures(event.target || document);
+});
diff --git a/ocg-server/static/js/dashboard/user/session-proposals.js b/ocg-server/static/js/dashboard/user/session-proposals.js
index 2cd574dcd..40b2161e2 100644
--- a/ocg-server/static/js/dashboard/user/session-proposals.js
+++ b/ocg-server/static/js/dashboard/user/session-proposals.js
@@ -187,6 +187,4 @@ const initializeSessionProposals = () => {
 
 initializeSessionProposals();
 
-if (document.body) {
-  document.body.addEventListener("htmx:load", initializeSessionProposals);
-}
+document.addEventListener("htmx:load", initializeSessionProposals);
diff --git a/ocg-server/static/js/dashboard/user/submissions.js b/ocg-server/static/js/dashboard/user/submissions.js
index 966021e39..331ec8ecc 100644
--- a/ocg-server/static/js/dashboard/user/submissions.js
+++ b/ocg-server/static/js/dashboard/user/submissions.js
@@ -101,6 +101,4 @@ const initializeSubmissionActions = () => {
 
 initializeSubmissionActions();
 
-if (document.body) {
-  document.body.addEventListener("htmx:load", initializeSubmissionActions);
-}
+document.addEventListener("htmx:load", initializeSubmissionActions);
diff --git a/ocg-server/static/js/event/attendance.js b/ocg-server/static/js/event/attendance.js
index 2491e5920..e0823f260 100644
--- a/ocg-server/static/js/event/attendance.js
+++ b/ocg-server/static/js/event/attendance.js
@@ -1026,16 +1026,15 @@ const initializeAttendance = (root = document) => {
     }
   });
 
-  if (document.body?.dataset.attendanceListenersReady === "true") {
-    return;
+  if (document.documentElement.dataset.attendanceListenersReady !== "true") {
+    document.documentElement.dataset.attendanceListenersReady = "true";
+    document.addEventListener("htmx:configRequest", handleConfigRequest);
+    document.addEventListener("htmx:beforeRequest", handleBeforeRequest);
+    document.addEventListener("htmx:afterRequest", handleAfterRequest);
+    document.addEventListener("click", handleAttendanceClick);
+    document.addEventListener("keydown", handleAttendanceKeydown);
   }
 
-  document.body.dataset.attendanceListenersReady = "true";
-  document.body.addEventListener("htmx:configRequest", handleConfigRequest);
-  document.body.addEventListener("htmx:beforeRequest", handleBeforeRequest);
-  document.body.addEventListener("htmx:afterRequest", handleAfterRequest);
-  document.body.addEventListener("click", handleAttendanceClick);
-  document.addEventListener("keydown", handleAttendanceKeydown);
   reconcilePaymentReturn();
 };
 
diff --git a/ocg-server/static/js/event/cfs.js b/ocg-server/static/js/event/cfs.js
index 6a0b1b651..a5318e5d0 100644
--- a/ocg-server/static/js/event/cfs.js
+++ b/ocg-server/static/js/event/cfs.js
@@ -65,6 +65,7 @@ const handleModalSwap = (event) => {
   }
 };
 
-if (document.body) {
-  document.body.addEventListener("htmx:afterSwap", handleModalSwap);
+if (document.documentElement.dataset.cfsModalSwapReady !== "true") {
+  document.documentElement.dataset.cfsModalSwapReady = "true";
+  document.addEventListener("htmx:afterSwap", handleModalSwap);
 }
diff --git a/ocg-server/static/js/group/membership.js b/ocg-server/static/js/group/membership.js
index 416b8eea3..312213986 100644
--- a/ocg-server/static/js/group/membership.js
+++ b/ocg-server/static/js/group/membership.js
@@ -266,14 +266,14 @@ const handleMembershipClick = (event) => {
 const initializeMembership = (root = document) => {
   getMembershipContainers(root).forEach(initializeMembershipContainer);
 
-  if (document.body?.dataset.membershipListenersReady === "true") {
+  if (document.documentElement.dataset.membershipListenersReady === "true") {
     return;
   }
 
-  document.body.dataset.membershipListenersReady = "true";
-  document.body.addEventListener("htmx:beforeRequest", handleBeforeRequest);
-  document.body.addEventListener("htmx:afterRequest", handleAfterRequest);
-  document.body.addEventListener("click", handleMembershipClick);
+  document.documentElement.dataset.membershipListenersReady = "true";
+  document.addEventListener("htmx:beforeRequest", handleBeforeRequest);
+  document.addEventListener("htmx:afterRequest", handleAfterRequest);
+  document.addEventListener("click", handleMembershipClick);
 };
 
 if (document.readyState === "loading") {
diff --git a/tests/unit/dashboard/community/team-add-member.test.js b/tests/unit/dashboard/community/team-add-member.test.js
index 64e70a652..5642a3ed8 100644
--- a/tests/unit/dashboard/community/team-add-member.test.js
+++ b/tests/unit/dashboard/community/team-add-member.test.js
@@ -97,6 +97,20 @@ describe("team-add-member", () => {
     expect(focusCalls).to.equal(1);
   });
 
+  it("allows the user search dropdown to overflow the modal", async () => {
+    const element = await mountLitComponentWithAttributes("team-add-member", {
+      attributes: {
+        "role-options": JSON.stringify([{ display_name: "Maintainer", community_role_id: "role-1" }]),
+      },
+    });
+
+    element._open();
+    await element.updateComplete;
+
+    expect(element.querySelector(".modal-card").classList.contains("modal-overflow-visible")).to.equal(true);
+    expect(element.querySelector(".modal-body").classList.contains("modal-overflow-visible")).to.equal(true);
+  });
+
   it("enables submit only after both a user and role have been selected", async () => {
     const element = await mountLitComponentWithAttributes("team-add-member", {
       attributes: {
diff --git a/tests/unit/dashboard/event/cfs-submissions.test.js b/tests/unit/dashboard/event/cfs-submissions.test.js
index 2af16cb83..f5d62a213 100644
--- a/tests/unit/dashboard/event/cfs-submissions.test.js
+++ b/tests/unit/dashboard/event/cfs-submissions.test.js
@@ -87,9 +87,7 @@ describe("review-submission-modal", () => {
     await element.updateComplete;
 
     expect(element._isOpen).to.equal(true);
-    expect(element.labels).to.deep.equal([
-      { event_cfs_label_id: "7", name: "Backend", color: "blue" },
-    ]);
+    expect(element.labels).to.deep.equal([{ event_cfs_label_id: "7", name: "Backend", color: "blue" }]);
     expect(element._message).to.equal("Please expand the abstract");
     expect(element._ratingComment).to.equal("Looks promising");
     expect(element._ratingStars).to.equal(4);
@@ -99,6 +97,33 @@ describe("review-submission-modal", () => {
     expect(element.querySelector("#cfs-submission-form")).to.not.equal(null);
   });
 
+  it("opens from a review trigger after the dashboard body is swapped", async () => {
+    const replacementBody = document.createElement("body");
+    document.documentElement.replaceChild(replacementBody, document.body);
+
+    const element = await renderModal();
+    element.id = "review-submission-modal";
+    const submissionPayload = JSON.stringify(buildSubmission());
+    document.body.insertAdjacentHTML(
+      "beforeend",
+      `
+        <button
+          type="button"
+          data-action="open-cfs-submission-modal"
+          data-submission='${submissionPayload}'
+        >
+          Review
+        </button>
+      `,
+    );
+
+    document.querySelector('[data-action="open-cfs-submission-modal"]')?.click();
+    await element.updateComplete;
+
+    expect(element._isOpen).to.equal(true);
+    expect(element._submission.cfs_submission_id).to.equal(12);
+  });
+
   it("tracks pending changes while keeping label order snapshots stable", async () => {
     const element = await renderModal();
 
diff --git a/tests/unit/dashboard/group/attendees.test.js b/tests/unit/dashboard/group/attendees.test.js
index 7d977398d..84652ca90 100644
--- a/tests/unit/dashboard/group/attendees.test.js
+++ b/tests/unit/dashboard/group/attendees.test.js
@@ -83,6 +83,35 @@ describe("dashboard group attendees", () => {
     expect(modal.classList.contains("hidden")).to.equal(false);
   });
 
+  it("opens the attendee notification modal after the dashboard body is swapped", () => {
+    const replacementBody = document.createElement("body");
+    replacementBody.innerHTML = `
+      <button
+        id="open-attendee-notification-modal"
+        type="button"
+        data-event-id="event-99"
+      >
+        Notify attendees
+      </button>
+      <div id="attendee-notification-modal" class="hidden"></div>
+      <button id="close-attendee-notification-modal" type="button">Close</button>
+      <button id="cancel-attendee-notification" type="button">Cancel</button>
+      <div id="overlay-attendee-notification-modal"></div>
+      <form id="attendee-notification-form"></form>
+    `;
+    document.documentElement.replaceChild(replacementBody, document.body);
+
+    initializeAttendeesUi();
+    document.getElementById("open-attendee-notification-modal")?.click();
+
+    expect(document.getElementById("attendee-notification-form")?.getAttribute("hx-post")).to.equal(
+      "/dashboard/group/notifications/event-99",
+    );
+    expect(document.getElementById("attendee-notification-modal")?.classList.contains("hidden")).to.equal(
+      false,
+    );
+  });
+
   it("opens the refund review modal with attendee payment details", () => {
     const originalHtmx = window.htmx;
     const processCalls = [];
@@ -136,10 +165,7 @@ describe("dashboard group attendees", () => {
     expect(rejectButton.getAttribute("hx-put")).to.equal(
       "/dashboard/group/events/event-1/attendees/user-1/refund/reject",
     );
-    expect(processCalls).to.deep.equal([
-      "attendee-refund-approve",
-      "attendee-refund-reject",
-    ]);
+    expect(processCalls).to.deep.equal(["attendee-refund-approve", "attendee-refund-reject"]);
 
     window.htmx = originalHtmx;
   });
@@ -344,12 +370,8 @@ describe("dashboard group attendees", () => {
     document.querySelector("[data-refund-review-trigger]")?.click();
 
     expect(modal.classList.contains("hidden")).to.equal(false);
-    expect(document.getElementById("attendee-refund-name")?.textContent).to.equal(
-      "Swapped Attendee",
-    );
-    expect(document.getElementById("attendee-refund-ticket")?.textContent).to.equal(
-      "Swapped Ticket",
-    );
+    expect(document.getElementById("attendee-refund-name")?.textContent).to.equal("Swapped Attendee");
+    expect(document.getElementById("attendee-refund-ticket")?.textContent).to.equal("Swapped Ticket");
     expect(document.getElementById("attendee-refund-amount")?.textContent).to.equal("EUR 25.00");
     expect(approveButton.getAttribute("hx-put")).to.equal(
       "/dashboard/group/events/event-2/attendees/user-2/refund/approve",
@@ -463,10 +485,7 @@ describe("dashboard group attendees", () => {
 
     document.querySelector("[data-refund-review-trigger]")?.click();
 
-    expect(processCalls).to.deep.equal([
-      "attendee-refund-approve",
-      "attendee-refund-reject",
-    ]);
+    expect(processCalls).to.deep.equal(["attendee-refund-approve", "attendee-refund-reject"]);
 
     window.htmx = originalHtmx;
   });
diff --git a/tests/unit/dashboard/group/members.test.js b/tests/unit/dashboard/group/members.test.js
index ff6953484..2c0c88c99 100644
--- a/tests/unit/dashboard/group/members.test.js
+++ b/tests/unit/dashboard/group/members.test.js
@@ -1,7 +1,8 @@
 import { expect } from "@open-wc/testing";
 
+import "/static/js/dashboard/group/members.js";
 import { useDashboardTestEnv } from "/tests/unit/test-utils/env.js";
-import { dispatchHtmxAfterRequest } from "/tests/unit/test-utils/htmx.js";
+import { dispatchHtmxAfterRequest, dispatchHtmxLoad } from "/tests/unit/test-utils/htmx.js";
 
 describe("dashboard group members", () => {
   const env = useDashboardTestEnv({
@@ -22,7 +23,7 @@ describe("dashboard group members", () => {
       </form>
     `;
 
-    await import(`/static/js/dashboard/group/members.js?test=${Date.now()}`);
+    dispatchHtmxLoad();
 
     dispatchHtmxAfterRequest(document.getElementById("notification-form"), {
       status: 204,
@@ -33,4 +34,23 @@ describe("dashboard group members", () => {
       icon: "success",
     });
   });
+
+  it("opens the notification modal after the dashboard body is swapped", () => {
+    const replacementBody = document.createElement("body");
+    replacementBody.innerHTML = `
+      <button id="open-notification-modal" type="button">Open</button>
+      <div id="notification-modal" class="hidden"></div>
+      <button id="close-notification-modal" type="button">Close</button>
+      <button id="cancel-notification" type="button">Cancel</button>
+      <div id="overlay-notification-modal"></div>
+      <form id="notification-form"></form>
+    `;
+
+    document.documentElement.replaceChild(replacementBody, document.body);
+
+    dispatchHtmxLoad();
+    document.getElementById("open-notification-modal")?.click();
+
+    expect(document.getElementById("notification-modal")?.classList.contains("hidden")).to.equal(false);
+  });
 });
diff --git a/tests/unit/dashboard/group/sponsors.test.js b/tests/unit/dashboard/group/sponsors.test.js
new file mode 100644
index 000000000..2c0fc78eb
--- /dev/null
+++ b/tests/unit/dashboard/group/sponsors.test.js
@@ -0,0 +1,51 @@
+import { expect } from "@open-wc/testing";
+
+import "/static/js/dashboard/group/sponsors.js";
+import { waitForMicrotask } from "/tests/unit/test-utils/async.js";
+import { useDashboardTestEnv } from "/tests/unit/test-utils/env.js";
+import { dispatchHtmxLoad } from "/tests/unit/test-utils/htmx.js";
+import { mockFetch } from "/tests/unit/test-utils/network.js";
+
+describe("dashboard group sponsors", () => {
+  useDashboardTestEnv({
+    path: "/dashboard/group/sponsors",
+    withScroll: true,
+    withSwal: true,
+  });
+
+  let fetchMock;
+
+  beforeEach(() => {
+    fetchMock = mockFetch();
+  });
+
+  afterEach(() => {
+    fetchMock.restore();
+  });
+
+  it("updates sponsor featured toggles after the dashboard body is swapped", async () => {
+    const replacementBody = document.createElement("body");
+    replacementBody.innerHTML = `
+      <label class="cursor-pointer">
+        <input
+          type="checkbox"
+          class="sponsor-featured-toggle"
+          data-url="/dashboard/group/sponsors/sponsor-7/featured"
+        />
+      </label>
+      <div id="dashboard-content"></div>
+    `;
+    document.documentElement.replaceChild(replacementBody, document.body);
+
+    dispatchHtmxLoad();
+    const checkbox = document.querySelector(".sponsor-featured-toggle");
+    checkbox.checked = true;
+    checkbox.dispatchEvent(new Event("change", { bubbles: true }));
+
+    await waitForMicrotask();
+
+    expect(fetchMock.calls).to.have.length(1);
+    expect(fetchMock.calls[0][0]).to.equal("/dashboard/group/sponsors/sponsor-7/featured");
+    expect(checkbox.dataset.currentChecked).to.equal("true");
+  });
+});
diff --git a/tests/unit/dashboard/user/session-proposals.test.js b/tests/unit/dashboard/user/session-proposals.test.js
index c502ddfd6..d439789ce 100644
--- a/tests/unit/dashboard/user/session-proposals.test.js
+++ b/tests/unit/dashboard/user/session-proposals.test.js
@@ -50,6 +50,20 @@ describe("dashboard user session proposals", () => {
     expect(modalComponent.dataset.sessionProposalReady).to.equal("true");
   });
 
+  it("opens the create modal after the dashboard body is swapped", () => {
+    const replacementBody = document.createElement("body");
+    replacementBody.innerHTML = `
+      <button id="open-session-proposal-modal" type="button">Open</button>
+    `;
+    replacementBody.append(modalComponent);
+    document.documentElement.replaceChild(replacementBody, document.body);
+
+    initializeSessionProposalsUi();
+    document.getElementById("open-session-proposal-modal")?.click();
+
+    expect(modalComponent.openCreateCalls).to.equal(1);
+  });
+
   it("opens edit and view modals with normalized proposal payloads", () => {
     const proposalPayload = JSON.stringify({
       session_proposal_id: 12,
@@ -132,7 +146,10 @@ describe("dashboard user session proposals", () => {
       text: "Are you sure you want to delete this session proposal?",
       confirmButtonText: "Delete",
     });
-    expect(env.current.htmx.triggerCalls[0]).to.deep.equal(["#delete-session-proposal-proposal-7", "confirmed"]);
+    expect(env.current.htmx.triggerCalls[0]).to.deep.equal([
+      "#delete-session-proposal-proposal-7",
+      "confirmed",
+    ]);
 
     const rejectButton = document.querySelector('[data-action="reject-co-speaker-invitation"]');
     rejectButton.click();
diff --git a/tests/unit/dashboard/user/submissions.test.js b/tests/unit/dashboard/user/submissions.test.js
index 108b84b79..2b2fbf153 100644
--- a/tests/unit/dashboard/user/submissions.test.js
+++ b/tests/unit/dashboard/user/submissions.test.js
@@ -50,6 +50,33 @@ describe("dashboard user submissions", () => {
     expect(document.body.style.overflow).to.equal("");
   });
 
+  it("opens the action required modal after the dashboard body is swapped", () => {
+    const replacementBody = document.createElement("body");
+    replacementBody.innerHTML = `
+      <div id="action-required-modal" class="hidden"></div>
+      <div id="action-required-modal-message"></div>
+      <button id="close-action-required-modal" type="button">Close</button>
+      <button id="cancel-action-required-modal" type="button">Cancel</button>
+      <div id="overlay-action-required-modal"></div>
+      <button
+        type="button"
+        data-action="open-action-required-modal"
+        data-action-required-message="Please update the bio before resubmitting."
+      >
+        Open
+      </button>
+    `;
+    document.documentElement.replaceChild(replacementBody, document.body);
+
+    initializeSubmissionsUi();
+    document.querySelector('[data-action="open-action-required-modal"]')?.click();
+
+    expect(document.getElementById("action-required-modal-message")?.textContent).to.equal(
+      "Please update the bio before resubmitting.",
+    );
+    expect(document.getElementById("action-required-modal")?.classList.contains("hidden")).to.equal(false);
+  });
+
   it("opens a confirmation dialog for withdraw actions and handles request errors", async () => {
     document.body.innerHTML = `
       <button
@@ -71,7 +98,9 @@ describe("dashboard user submissions", () => {
     expect(env.current.swal.calls).to.have.length(1);
     expect(env.current.swal.calls[0].html).to.include("Are you sure you want to withdraw this submission?");
     expect(env.current.swal.calls[0].confirmButtonText).to.equal("Withdraw");
-    expect(env.current.htmx.triggerCalls).to.deep.equal([["#withdraw-submission-submission-42", "confirmed"]]);
+    expect(env.current.htmx.triggerCalls).to.deep.equal([
+      ["#withdraw-submission-submission-42", "confirmed"],
+    ]);
 
     dispatchHtmxAfterRequest(button, {
       status: 500,
@@ -106,7 +135,9 @@ describe("dashboard user submissions", () => {
     expect(env.current.swal.calls).to.have.length(1);
     expect(env.current.swal.calls[0].html).to.include("Before resubmitting, please make sure");
     expect(env.current.swal.calls[0].confirmButtonText).to.equal("Resubmit");
-    expect(env.current.htmx.triggerCalls).to.deep.equal([["#resubmit-submission-submission-84", "confirmed"]]);
+    expect(env.current.htmx.triggerCalls).to.deep.equal([
+      ["#resubmit-submission-submission-84", "confirmed"],
+    ]);
 
     dispatchHtmxAfterRequest(button, {
       status: 204,
diff --git a/tests/unit/event/attendance.test.js b/tests/unit/event/attendance.test.js
index 72f5f82b9..e6d0aacb6 100644
--- a/tests/unit/event/attendance.test.js
+++ b/tests/unit/event/attendance.test.js
@@ -161,6 +161,17 @@ describe("event attendance", () => {
     expect(meetingDetails[0].classList.contains("hidden")).to.equal(false);
   });
 
+  it("handles attendance clicks after the page body is swapped", () => {
+    const replacementBody = document.createElement("body");
+    document.documentElement.replaceChild(replacementBody, document.body);
+    const { signinButton } = renderAttendanceDom();
+
+    signinButton.click();
+
+    expect(env.current.swal.calls[0].icon).to.equal("info");
+    expect(env.current.swal.calls[0].html).to.include("/log-in?next_url=/events/test-event");
+  });
+
   it("keeps the join meeting link hidden when the event is canceled", () => {
     const { checker, alwaysJoinLink, liveJoinLink, menuJoinLink, meetingDetails } = renderAttendanceDom({
       attendeeMeetingAccessOpen: "true",
diff --git a/tests/unit/event/cfs.test.js b/tests/unit/event/cfs.test.js
index 410ab0bd7..ff3f6a790 100644
--- a/tests/unit/event/cfs.test.js
+++ b/tests/unit/event/cfs.test.js
@@ -83,4 +83,29 @@ describe("event cfs modal", () => {
     document.getElementById("cancel-cfs-modal")?.click();
     expect(modal.classList.contains("hidden")).to.equal(true);
   });
+
+  it("opens after the page body is swapped", async () => {
+    await import(`/static/js/event/cfs.js?test=${Date.now()}-body-swap`);
+
+    const replacementBody = document.createElement("body");
+    replacementBody.innerHTML = `
+      <div id="cfs-modal-root"></div>
+      <div id="cfs-modal" class="hidden">
+        <button id="close-cfs-modal" type="button">Close</button>
+        <div id="overlay-cfs-modal"></div>
+        <button id="cancel-cfs-modal" type="button">Cancel</button>
+        <select id="session_proposal_id">
+          <option value="">Pick one</option>
+          <option value="12">Proposal</option>
+        </select>
+        <button id="cfs-submit-button" type="button">Submit</button>
+      </div>
+    `;
+    document.documentElement.replaceChild(replacementBody, document.body);
+
+    dispatchHtmxAfterSwap(document.getElementById("cfs-modal-root"));
+    await waitForMicrotask();
+
+    expect(document.getElementById("cfs-modal")?.classList.contains("hidden")).to.equal(false);
+  });
 });
diff --git a/tests/unit/group/membership.test.js b/tests/unit/group/membership.test.js
index 5ca9393a5..96bc91d75 100644
--- a/tests/unit/group/membership.test.js
+++ b/tests/unit/group/membership.test.js
@@ -98,6 +98,17 @@ describe("group membership", () => {
     expect(env.current.htmx.triggerCalls).to.deep.equal([["#leave-btn", "confirmed"]]);
   });
 
+  it("handles membership clicks after the page body is swapped", () => {
+    const replacementBody = document.createElement("body");
+    document.documentElement.replaceChild(replacementBody, document.body);
+    const { signinButton } = renderMembershipDom();
+
+    signinButton.click();
+
+    expect(env.current.swal.calls[0].icon).to.equal("info");
+    expect(env.current.swal.calls[0].html).to.include("/log-in?next_url=/groups/test-group");
+  });
+
   it("closes the group actions menu when clicking outside it", () => {
     renderMembershipDom();
     document.body.insertAdjacentHTML(