diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 68aa6ceb8..ff00c5eda 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -14,6 +14,8 @@
         they are large enough when generating thumbnails in Storage/Image.pm
  - fix: WebGUI::Image->new doesn't obey width and height settings (Martin Kamerbeek /Oqapi)
  	http://www.plainblack.com/bugs/tracker/webguiimage-new-doesnt-obey-width-and-height-settings
+ - fix: Calendar week view didn't display events correctly if they happened on
+        Sunday or if first day of week was set to Monday.
 
 7.3.14
  - fix: a typo in DatabaseLink.pm
diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm
index b08662b57..be831be2d 100644
--- a/lib/WebGUI/Asset/Wobject/Calendar.pm
+++ b/lib/WebGUI/Asset/Wobject/Calendar.pm
@@ -1321,12 +1321,12 @@ sub viewWeek {
             $dt_event_end = $dtEnd;
         }
 
-        $dt_event_start->set_locale($i18n->get("locale"));
-        $dt_event_end->set_locale($i18n->get("locale"));
+        my $start_dow = ($dt_event_start->day_of_week - $first_dow) % 7;
+        my $end_dow = ($dt_event_end->day_of_week - $first_dow) % 7;
 
         my %eventTemplateVariables = $self->getEventVars($event);
 
-        foreach my $weekDay ($dt_event_start->day_of_week..$dt_event_end->day_of_week) {
+        foreach my $weekDay ($start_dow .. $end_dow) {
             push @{$var->{days}->[$weekDay]->{events}}, \%eventTemplateVariables;
         }
     }