diff --git a/frontend/src/js/datepicker.js b/frontend/src/js/datepicker.js
index 286db394..4a8696a7 100644
--- a/frontend/src/js/datepicker.js
+++ b/frontend/src/js/datepicker.js
@@ -108,6 +108,21 @@ function isMobile() {
     return isMobileDevice() || isTouchDevice();
 }
 
+// AirDatepicker creates a single overlay for all mobile pickers and keeps it in
+// its module scope, inside a global container on the body. A boosted navigation
+// swaps the body: AirDatepicker then rebuilds the container, but keeps the old
+// overlay, which is left detached and can't receive the clicks that close a picker.
+let mobileOverlay = null;
+
+function createAirDatepicker(element, opts) {
+    const datepicker = new AirDatepicker(element, opts);
+    mobileOverlay ??= document.querySelector('.air-datepicker-overlay');
+    if (mobileOverlay && !mobileOverlay.isConnected) {
+        document.getElementById(AirDatepicker.defaultGlobalContainerId).appendChild(mobileOverlay);
+    }
+    return datepicker;
+}
+
 window.DatePicker = async function createDynamicDatePicker(element) {
     let todayButton = {
         content: element.dataset.nowButtonTxt,
@@ -182,7 +197,7 @@ window.DatePicker = async function createDynamicDatePicker(element) {
         opts["selectedDates"] = [element.dataset.value];
         opts["startDate"] = [element.dataset.value];
     }
-    return new AirDatepicker(element, opts);
+    return createAirDatepicker(element, opts);
 };
 
 window.MonthYearPicker = async function createDynamicDatePicker(element) {
@@ -258,7 +273,7 @@ window.MonthYearPicker = async function createDynamicDatePicker(element) {
         opts["selectedDates"] = [new Date(element.dataset.value + "T00:00:00")];
         opts["startDate"] = [new Date(element.dataset.value + "T00:00:00")];
     }
-    return new AirDatepicker(element, opts);
+    return createAirDatepicker(element, opts);
 };
 
 window.YearPicker = async function createDynamicDatePicker(element) {
@@ -334,5 +349,5 @@ window.YearPicker = async function createDynamicDatePicker(element) {
         opts["selectedDates"] = [new Date(element.dataset.value + "T00:00:00")];
         opts["startDate"] = [new Date(element.dataset.value + "T00:00:00")];
     }
-    return new AirDatepicker(element, opts);
+    return createAirDatepicker(element, opts);
 };