diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index f19879091..f4d22a296 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -1307,23 +1307,20 @@ ICS ==> create a new event with the same UID and a RECURRENCE-ID field (with a v
             updateDateRange();
             updateRecurring();
         });
+        var f = Flatpickr(goDate, {
+            enableTime: false,
+            defaultDate: APP.calendar.getDate()._date,
+            clickOpens: false,
+            //dateFormat: dateFormat,
+            onChange: function (date) {
+                date[0].setHours(12);
+                APP.moveToDate(+date[0]);
+                updateDateRange();
+                updateRecurring();
+            },
+        });
         $(goDate).click(function () {
-            var f = Flatpickr(goDate, {
-                enableTime: false,
-                defaultDate: APP.calendar.getDate()._date,
-                //dateFormat: dateFormat,
-                onChange: function (date) {
-                    date[0].setHours(12);
-                    f.destroy();
-                    APP.moveToDate(+date[0]);
-                    updateDateRange();
-                    updateRecurring();
-                },
-                onClose: function () {
-                    setTimeout(f.destroy);
-                }
-            });
-            f.open();
+            return f.isOpen ? f.close() : f.open();
         });
         APP.toolbar.$bottomL.append(h('div.cp-calendar-browse', [
             goLeft, goToday, goRight, goDate