diff --git a/src/gcal-window.c b/src/gcal-window.c
index f4ff24ea..d35be5a8 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -412,13 +412,13 @@ update_active_date (GcalWindow   *window,
 
   if (previous_date->year != new_date->year ||
       !g_date_valid (&old_week) ||
-      g_date_get_iso8601_week_of_year (&old_week) != g_date_get_iso8601_week_of_year(&new_week))
+      g_date_get_iso8601_week_of_year (&old_week) != g_date_get_iso8601_week_of_year (&new_week))
     {
       date_start = g_date_time_new_local (new_date->year, new_date->month, new_date->day, 0, 0, 0);
-      date_start = g_date_time_add_days (date_start, (get_first_weekday() - g_date_time_get_day_of_week (date_start) + 7) % 7 - 8);
+      date_start = g_date_time_add_days (date_start, (get_first_weekday () - g_date_time_get_day_of_week (date_start) + 7) % 7 - 7);
       range_start = g_date_time_to_unix (date_start);
 
-      date_end = g_date_time_add_days (date_start, 6);
+      date_end = g_date_time_add_days (date_start, 7);
       range_end = g_date_time_to_unix (date_end);
 
       gcal_manager_set_subscriber (window->manager, E_CAL_DATA_MODEL_SUBSCRIBER (window->week_view), range_start, range_end);