diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m
index 59fea714b..9357b8e32 100644
--- a/UI/Scheduler/UIxCalDayTable.m
+++ b/UI/Scheduler/UIxCalDayTable.m
@@ -243,6 +243,7 @@
   NSEnumerator *aptsEnumerator;
   NSDictionary *currentDayAppointment;
   NSCalendarDate *start, *end;
+  int endHour;
 
   if (!allAppointments)
     {
@@ -254,7 +255,11 @@
   [filteredAppointments autorelease];
 
   start = [currentTableDay hour: [self dayStartHour] minute: 0];
-  end = [currentTableDay hour: [self dayEndHour] minute: 0];
+  endHour = [self dayEndHour];
+  if (endHour < 24)
+    end = [currentTableDay hour: [self dayEndHour] minute: 0];
+  else
+    end = [[currentTableDay tomorrow] hour: 0 minute: 0];
 
   aptsEnumerator = [allAppointments objectEnumerator];
   currentDayAppointment = [aptsEnumerator nextObject];