diff --git a/app/views/entries/_form.html.erb b/app/views/entries/_form.html.erb
index 1a39e14..7ec4310 100644
--- a/app/views/entries/_form.html.erb
+++ b/app/views/entries/_form.html.erb
@@ -13,11 +13,18 @@
   <!-- Erste Zeile: Datum, Stunden, Minuten -->
   <div class="row g-3 mt-1">
     <div class="col-12 col-md-4">
+
+
       <%= form.label :date, 'Datum', class: 'form-label' %>
-      <%= form.text_field :date,
+      <%= form.date_field  :date,
                           class: 'form-control flatpickr',
-                          data: { enable_time: false, allow_input: true },
-                          value: (form.object.date || Date.today) %>
+                           data: {
+                             enable_time: false,
+                             altInput: true,
+                             altFormat: 'd.m.Y',
+                             dateFormat: 'Y-m-d'  # Wichtig: Flatpickr braucht `dateFormat`
+                           },
+                           value: (form.object.date) %>
     </div>
 
     <div class="col-12 col-md-4">
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index eb2e426..7c034c8 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -35,9 +35,9 @@
 <script defer>
     document.addEventListener("DOMContentLoaded", function () {
         flatpickr(".flatpickr", {
-
-            dateFormat: "d.m.Y",
-            allowInput: true
+            altInput: true,
+            altFormat: "d.m.Y",
+            dateFormat: "Y-m-d"
         });
     });
 </script>