             allDay:      @model.isAllDay()
             sameDay:     @model.isSameDay()
             start:       @model.getStartDateObject()
-            end:         @model.getEndDateObject()
-                               .add((if @model.isAllDay() then -1 else 0), 'd')
+            end:         @model.getEndDateObject().add(endOffset, 'd')
             alerts: @model.get('alarms')
             guestsButtonText: @getGuestsButtonText()
             buttonText: @getButtonText()

        else
            currentCalendar = @model.get('tags')?[0] or defaultCalendar

        return data = _.extend super(),
            tFormat:     tFormat
            dFormat:     dFormat

        delta = if @model.isAllDay() then -1 else 0
        end = @model.getEndDateObject().add(delta, 'd')

        @$('.input-start').timepicker 'setTime',
            @model.getStartDateObject().format(tFormat), true, true
        @$('.input-end-time').timepicker 'setTime',
            end.format(tFormat), true, true
        @$('.input-end-date').val end.format(dFormat)

        @$('.input-description').val @model.get('details')
