diff --git a/app/views/shared/editable/_form.html.haml b/app/views/shared/editable/_form.html.haml
index 69b79cbcf..c009aa62a 100644
--- a/app/views/shared/editable/_form.html.haml
+++ b/app/views/shared/editable/_form.html.haml
@@ -12,7 +12,6 @@
       - elsif field_type == :select
         = f.select field, collection
       - elsif field_type == :date
-        = f.text_field field,
-                 value: model.send(field) ? model.send(field).to_fs(:ymd) : '',
-                 class: 'add-datepicker', label: 'When?'
+        = f.date_field field,
+                 value: model.send(field) ? model.send(field).to_fs(:ymd) : '', label: 'When?'
       = f.submit :save