diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go
index ea3f391..816cf89 100644
--- a/internal/handlers/handlers.go
+++ b/internal/handlers/handlers.go
@@ -214,9 +214,15 @@ func (h *Handlers) buildCalendarData(year int, month time.Month) map[string]any
 		days[day] = content
 	}
 
-	// Calculate first day offset (0 = Sunday)
+	// Calculate first day offset (0 = Monday, 6 = Sunday)
 	firstDay := time.Date(year, month, 1, 0, 0, 0, 0, time.Local)
 	firstDayWeekday := int(firstDay.Weekday())
+	// Adjust so Monday = 0, Sunday = 6
+	if firstDayWeekday == 0 {
+		firstDayWeekday = 6
+	} else {
+		firstDayWeekday--
+	}
 
 	// Previous/next month
 	prevMonth := time.Date(year, month-1, 1, 0, 0, 0, 0, time.Local)
diff --git a/web/templates/partials/calendar.html b/web/templates/partials/calendar.html
index df74d71..48bb689 100644
--- a/web/templates/partials/calendar.html
+++ b/web/templates/partials/calendar.html
@@ -21,13 +21,13 @@
     </div>
     
     <div class="calendar-weekdays">
-        <span>Sun</span>
         <span>Mon</span>
         <span>Tue</span>
         <span>Wed</span>
         <span>Thu</span>
         <span>Fri</span>
         <span>Sat</span>
+        <span>Sun</span>
     </div>
     
     <div class="calendar-grid">