diff --git a/RIGS/ical.py b/RIGS/ical.py
index 8ae94342..47ee669e 100644
--- a/RIGS/ical.py
+++ b/RIGS/ical.py
@@ -97,6 +97,9 @@ class CalendarICS(ICalFeed):
         return item.earliest_time
 
     def item_end_datetime(self, item):
+        if type(item.latest_time) is datetime.date: # Ical end_datetime is non-inclusive, so add a day
+            return item.latest_time + datetime.timedelta(days=1)
+
         return item.latest_time
 
     def item_location(self,item):
diff --git a/RIGS/templates/RIGS/calendar.html b/RIGS/templates/RIGS/calendar.html
index 0ac85749..23a0b1b8 100644
--- a/RIGS/templates/RIGS/calendar.html
+++ b/RIGS/templates/RIGS/calendar.html
@@ -56,11 +56,14 @@
                                 'non-rig': '#5bc0de'
                             };
                             $(doc).each(function() {
-                                
+                                end = $(this).attr('latest')
+                                if(end.indexOf("T") < 0){ //If latest does not contain a time
+                                   end = moment(end).add(1, 'days') //End date is non-inclusive, so add a day
+                                }
 
                                 thisEvent = {
                                     'start': $(this).attr('earliest'),
-                                    'end': $(this).attr('latest'),
+                                    'end': end,
                                     'className': 'modal-href',
                                     'title': $(this).attr('title'),
                                     'url': $(this).attr('url')