diff --git a/app/views/calendar/single/edit.php b/app/views/calendar/single/edit.php
index f8a2371699a92fa553f9cae3b3a7e294a39e1f2d..c22f7a6d9caea7463221f52cc27d0104a3000821 100644
--- a/app/views/calendar/single/edit.php
+++ b/app/views/calendar/single/edit.php
@@ -31,7 +31,7 @@
             <input type="text" name="start_date" id="start-date" value="<?= strftime('%x', $event->getStart()) ?>" size="12" required>
         </label>
 
-        <div class="col-3">
+        <label class="col-3">
             <?= _('Uhrzeit') ?>
 
             <div class="hgroup">
@@ -51,7 +51,7 @@
                        maxlength="2"<?= $event->isDayEvent() ? ' disabled' : '' ?>
                        aria-label="Minuten">
             </div>
-        </div>
+        </label>
 
         <section class="required">
             <?= _('Ende') ?>
@@ -62,7 +62,7 @@
             <input type="text" name="end_date" id="end-date" value="<?= strftime('%x', $event->getEnd()) ?>" size="12" required>
         </label>
 
-        <div class="col-3">
+        <label class="col-3">
             <?= _('Uhrzeit') ?>
 
             <div class="hgroup">
@@ -82,7 +82,7 @@
                        aria-label="<?= _("Minuten") ?>"
                        maxlength="2"<?= $event->isDayEvent() ? ' disabled' : '' ?>>
             </div>
-        </div>
+        </label>
 
         <label>
             <span class="required">
diff --git a/resources/assets/stylesheets/scss/forms.scss b/resources/assets/stylesheets/scss/forms.scss
index 555c7b77d9b1c1f2da52b24bf334042b50a8e8bf..556b661149e07b52af9c5ead81ee1a7918cd0644 100644
--- a/resources/assets/stylesheets/scss/forms.scss
+++ b/resources/assets/stylesheets/scss/forms.scss
@@ -312,7 +312,7 @@ form.default {
     .hgroup-btn {
         display: flex;
         flex-wrap: wrap;
-        align-items: flex-start;
+        align-items: baseline;
         max-width: $max-width-m;
 
         &.size-s {