diff --git a/src/components/EventEditor.vue b/src/components/EventEditor.vue
index 0192f037c..f33360301 100644
--- a/src/components/EventEditor.vue
+++ b/src/components/EventEditor.vue
@@ -13,10 +13,12 @@ b-modal(v-if="event && event.id", :id="'edit-modal-' + event.id", ref="eventEdit
         td {{ event.id }}
       tr
         th Start
-        datetime(type="datetime" v-model="start")
+        td
+          input(type="datetime-local" step="1" v-model="start")
       tr
         th End
-        datetime(type="datetime" v-model="end")
+        td
+          input(type="datetime-local" step="1" v-model="end")
       tr
         th Duration
         td {{ friendlyduration(editedEvent.duration) }}
@@ -78,7 +80,7 @@ export default {
   computed: {
     start: {
       get: function () {
-        return moment(this.editedEvent.timestamp).format();
+        return moment(this.editedEvent.timestamp).format('YYYY-MM-DDTHH:mm:ss');
       },
       set: function (dt) {
         // Duration needs to be set first since otherwise the computed for end will use the new timestamp
@@ -89,7 +91,7 @@ export default {
     end: {
       get: function () {
         const end = moment(this.editedEvent.timestamp).add(this.editedEvent.duration, 'seconds');
-        return end.format();
+        return end.format('YYYY-MM-DDTHH:mm:ss');
       },
       set: function (dt) {
         this.editedEvent.duration = moment(dt).diff(this.editedEvent.timestamp, 'seconds');