diff --git a/resources/assets/javascripts/studip-ui.js b/resources/assets/javascripts/studip-ui.js
index a1df9dcb4cd37e44e5bf70cdaa2a26625ac370c5..53fb13114a2135a39dc4c307904a9dd9ee4c2893 100644
--- a/resources/assets/javascripts/studip-ui.js
+++ b/resources/assets/javascripts/studip-ui.js
@@ -560,6 +560,7 @@ import { $gettext } from './lib/gettext.js';
                 'z-index': 1002
             });
         },
+        showButtonPanel: true,
         onSelect: function (value, instance) {
             if (value !== instance.lastVal) {
                 $(this).change();
@@ -608,6 +609,13 @@ import { $gettext } from './lib/gettext.js';
         $(input).datepicker('hide');
     }
 
+    // Jump to current date when "Now" is clicked
+    var _gotoToday = $.datepicker._gotoToday;
+    $.datepicker._gotoToday = function(id) {
+        _gotoToday.call(this, id);
+        this._selectDate(id);
+    };
+
     $.timepicker.setDefaults(Object.assign({}, defaults, {
         timeFormat: 'HH:mm'
     }));