diff --git a/iOS/ViewControllers/Courses/CourseAreaListViewController.swift b/iOS/ViewControllers/Courses/CourseAreaListViewController.swift
index 031cbf13c..06b943620 100644
--- a/iOS/ViewControllers/Courses/CourseAreaListViewController.swift
+++ b/iOS/ViewControllers/Courses/CourseAreaListViewController.swift
@@ -90,6 +90,7 @@ class CourseAreaListViewController: UICollectionViewController {
 
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
+        self.collectionViewLayout.invalidateLayout()
         if let selectedIndexPath = self.selectedIndexPath {
             self.collectionView?.scrollToItem(at: selectedIndexPath, at: .centeredHorizontally, animated: false)
         }
diff --git a/iOS/ViewControllers/Courses/CourseViewController.swift b/iOS/ViewControllers/Courses/CourseViewController.swift
index ca405de93..b2d607aaa 100644
--- a/iOS/ViewControllers/Courses/CourseViewController.swift
+++ b/iOS/ViewControllers/Courses/CourseViewController.swift
@@ -97,6 +97,7 @@ class CourseViewController: UIViewController {
         self.navigationController?.delegate = self
 
         self.decideContent()
+        self.updateCourseAreaListContainerHeight()
         self.updateHeaderConstraints()
 
         SpotlightHelper.shared.setUserActivity(for: self.course)
diff --git a/iOS/ViewControllers/Dashboard/CourseOverviewViewController.swift b/iOS/ViewControllers/Dashboard/CourseOverviewViewController.swift
index 8f01cff43..5ccb7ba10 100644
--- a/iOS/ViewControllers/Dashboard/CourseOverviewViewController.swift
+++ b/iOS/ViewControllers/Dashboard/CourseOverviewViewController.swift
@@ -57,6 +57,11 @@ class CourseOverviewViewController: UIViewController {
         })
     }
 
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+        self.collectionView.collectionViewLayout.invalidateLayout()
+    }
+
     @objc private func updateCollectionViewHeight() {
         let courseCellWidth = CourseCell.minimalWidth(for: self.collectionView.traitCollection)
         let availableWidth = self.view.bounds.width - self.view.layoutMargins.left - self.view.layoutMargins.right
diff --git a/iOS/Views/CourseAreaCell.swift b/iOS/Views/CourseAreaCell.swift
index 89bdf6b28..697550f36 100644
--- a/iOS/Views/CourseAreaCell.swift
+++ b/iOS/Views/CourseAreaCell.swift
@@ -40,6 +40,11 @@ class CourseAreaCell: UICollectionViewCell {
         }
     }
 
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+        self.titleView.font = Self.font(whenSelected: self.isSelected)
+    }
+
     func configure(for content: CourseArea) {
         self.titleView.text = content.title
     }