diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index 5acbac789b..95ada9bc07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -70,6 +70,12 @@
                     }
                 });
         },
+        onChange: function( selectedDates, dateText, instance) {
+            let parsedDate = flatpickr.parseDate(dateText, instance.config.dateFormat);
+            if ( !parsedDate.getHours() ) {
+                instance.setDate(selectedDates[0].setHours(23, 59, 0, 0));
+            }
+        },
         onClose: function( selectedDates, dateText, instance) {
             validate_date( dateText, instance );
             var thisInput = instance.input;