diff --git a/src/app/course/[courseName]/calendar/CalendarMonth.tsx b/src/app/course/[courseName]/calendar/CalendarMonth.tsx
index 866ac01..3c19f6e 100644
--- a/src/app/course/[courseName]/calendar/CalendarMonth.tsx
+++ b/src/app/course/[courseName]/calendar/CalendarMonth.tsx
@@ -17,6 +17,8 @@ export const CalendarMonth = ({ month }: { month: CalendarMonthModel }) => {
     "week calculation start date"
   );
 
+  const isPastSemester = Date.now() > new Date(settings.endDate).getTime();
+  
   const pastWeekNumber = getWeekNumber(
     startDate,
     new Date(Date.now() - four_days_in_milliseconds)
@@ -27,7 +29,7 @@ export const CalendarMonth = ({ month }: { month: CalendarMonthModel }) => {
     new Date(month.year, month.month, 1)
   );
 
-  const isInPast = pastWeekNumber >= startOfMonthWeekNumber;
+  const shouldCollapse = (pastWeekNumber >= startOfMonthWeekNumber) && !isPastSemester;
 
   const monthName = new Date(month.year, month.month - 1, 1).toLocaleString(
     "default",
@@ -37,7 +39,7 @@ export const CalendarMonth = ({ month }: { month: CalendarMonthModel }) => {
   return (
     <>
       <Expandable
-        defaultExpanded={!isInPast}
+        defaultExpanded={!shouldCollapse}
         ExpandableElement={({ setIsExpanded, isExpanded }) => (
           <div className="flex justify-center">
             <h3
diff --git a/src/app/course/[courseName]/lecture/[lectureDay]/preview/LecturePreviewPage.tsx b/src/app/course/[courseName]/lecture/[lectureDay]/preview/LecturePreviewPage.tsx
index 4d87578..5d9f0e5 100644
--- a/src/app/course/[courseName]/lecture/[lectureDay]/preview/LecturePreviewPage.tsx
+++ b/src/app/course/[courseName]/lecture/[lectureDay]/preview/LecturePreviewPage.tsx
@@ -29,7 +29,7 @@ export default function LecturePreviewPage({
             href={getLectureUrl(courseName, lectureDay)}
             shallow={true}
           >
-            Edit Page
+            Edit Lecture
           </Link>
         </div>
         <div className="">