diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index 36f3ec38..fc6f0e24 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -249,7 +249,7 @@ export default {
       if (!!this.date.multidate) {
         formData.append('end_datetime', this.$time.fromDateInput(this.date.due, this.date.dueHour || '23:59'))
       } else if (this.date.dueHour) {
-        formData.append('end_datetime', this.$time.fromDateInput(this.date.from, this.date.dueHour))
+        formData.append('end_datetime', this.$time.fromDateInput(this.date.due, this.date.dueHour))
       }
 
       if (this.edit) {
diff --git a/pages/index.vue b/pages/index.vue
index bdb36ad0..5cd4ab3e 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -83,7 +83,10 @@ export default {
         const max = this.selectedDay.endOf('day').toUnixInteger()
         return this.events.filter(e => (e.start_datetime <= max && (e.end_datetime || e.start_datetime) >= min) && (this.filter.show_recurrent || !e.parentId))
       } else if (this.isCurrentMonth && !this.filter.query) {
-          return this.events.filter(e => ((e.end_datetime ? e.end_datetime >= now : e.start_datetime + 3 * 60 * 60 >= now) && (this.filter.show_recurrent || !e.parentId)))
+          return this.events.filter(e => {
+            const max_datetime = Math.max(e.start_datetime, e.end_datetime)
+            return (e.end_datetime ? max_datetime >= now : e.start_datetime + 3 * 60 * 60 >= now) && (this.filter.show_recurrent || !e.parentId)
+          })
       } else {
         return this.events.filter(e => this.filter.show_recurrent || !e.parentId)
       }