diff --git a/src/main/java/de/nilzbu/mytimetracker/ui/view/timeentry/TimeEntryFormConfigurer.java b/src/main/java/de/nilzbu/mytimetracker/ui/view/timeentry/TimeEntryFormConfigurer.java
index dcd426b..2500f4a 100644
--- a/src/main/java/de/nilzbu/mytimetracker/ui/view/timeentry/TimeEntryFormConfigurer.java
+++ b/src/main/java/de/nilzbu/mytimetracker/ui/view/timeentry/TimeEntryFormConfigurer.java
@@ -13,18 +13,21 @@ import org.vaadin.crudui.crud.impl.GridCrud;
 import org.vaadin.crudui.form.CrudFormFactory;
 import org.vaadin.crudui.form.impl.form.factory.DefaultCrudFormFactory;
 
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalTime;
+import java.util.Locale;
 
 final class TimeEntryFormConfigurer {
 
-    private TimeEntryFormConfigurer() {}
+    private TimeEntryFormConfigurer() {
+    }
 
     static void configure(GridCrud<TimeEntry> crud, SerializableSupplier<TimeEntry> newInstanceSupplier) {
         CrudFormFactory<TimeEntry> formFactory = new DefaultCrudFormFactory<>(TimeEntry.class);
 
         formFactory.setVisibleProperties(
-                CrudOperation.ADD,    "date", "startTime", "endTime", "pauseMinutes", "targetMinutes", "status", "comment"
+                CrudOperation.ADD, "date", "startTime", "endTime", "pauseMinutes", "targetMinutes", "status", "comment"
         );
         formFactory.setVisibleProperties(
                 CrudOperation.UPDATE, "date", "startTime", "endTime", "pauseMinutes", "targetMinutes", "status", "comment"
@@ -44,15 +47,20 @@ final class TimeEntryFormConfigurer {
         formFactory.setFieldProvider("startTime", (TimeEntry bean) -> {
             TimePicker tp = new TimePicker("Start");
             tp.setRequiredIndicatorVisible(true);
+            tp.setLocale(Locale.of("de", "DE"));
             tp.setMin(LocalTime.of(5, 0));
             tp.setMax(LocalTime.of(23, 59));
+            tp.setStep(Duration.ofMinutes(15));
             return tp;
         });
         formFactory.setFieldProvider("endTime", (TimeEntry bean) -> {
             TimePicker tp = new TimePicker("End");
             tp.setRequiredIndicatorVisible(true);
+            tp.setLocale(Locale.of("de", "DE"));
             tp.setMin(LocalTime.of(5, 0));
             tp.setMax(LocalTime.of(23, 59));
+            tp.setStep(Duration.ofMinutes(15));
+
             return tp;
         });