diff --git a/web/src/click_handlers.js b/web/src/click_handlers.js
index 7fb521eae4..dd9252f37d 100644
--- a/web/src/click_handlers.js
+++ b/web/src/click_handlers.js
@@ -954,6 +954,7 @@ export function initialize() {
                 !$(e.target).closest("[data-tippy-root]").length &&
                 !$(e.target).closest(".typeahead").length &&
                 !$(e.target).closest(".enter_sends").length &&
+                !$(e.target).closest(".flatpickr-calendar").length &&
                 $(e.target).closest("body").length
             ) {
                 // Unfocus our compose area if we click out of it. Don't let exits out
diff --git a/web/src/popovers.js b/web/src/popovers.js
index 1e8745de06..96bd690cb6 100644
--- a/web/src/popovers.js
+++ b/web/src/popovers.js
@@ -132,11 +132,6 @@ export function set_suppress_scroll_hide() {
 }
 
 export function register_click_handlers() {
-    $("body").on("click", ".flatpickr-calendar", (e) => {
-        e.stopPropagation();
-        e.preventDefault();
-    });
-
     {
         let last_scroll = 0;