diff --git a/src/components/UserDashboard.vue b/src/components/UserDashboard.vue
index 68d9f65..e20a3db 100644
--- a/src/components/UserDashboard.vue
+++ b/src/components/UserDashboard.vue
@@ -416,10 +416,19 @@ function formatNextWorkoutTime(workout) {
   transition: margin-left var(--transition-base);
 }
 
+/* Adjust for collapsed sidebar */
+body.sidebar-collapsed .dashboard-container {
+  margin-left: 80px;
+}
+
 @media (max-width: 768px) {
   .dashboard-container {
     margin-left: 0;
   }
+
+  body.sidebar-collapsed .dashboard-container {
+    margin-left: 0;
+  }
 }
 
 .dashboard-content {
diff --git a/src/components/WorkoutCalendar.vue b/src/components/WorkoutCalendar.vue
index c6deb3e..d25b689 100644
--- a/src/components/WorkoutCalendar.vue
+++ b/src/components/WorkoutCalendar.vue
@@ -629,6 +629,23 @@ function formatDateMonth(dateStr) {
 .calendar-page {
   min-height: 100vh;
   background: var(--color-background);
+  margin-left: 280px;
+  transition: margin-left var(--transition-base);
+}
+
+/* Adjust for collapsed sidebar */
+body.sidebar-collapsed .calendar-page {
+  margin-left: 80px;
+}
+
+@media (max-width: 768px) {
+  .calendar-page {
+    margin-left: 0;
+  }
+
+  body.sidebar-collapsed .calendar-page {
+    margin-left: 0;
+  }
 }
 
 .calendar-content {