diff --git a/Sources/SnapshotPreviewsCore/ExpandingViewController.swift b/Sources/SnapshotPreviewsCore/ExpandingViewController.swift
index e3b4228..a18c945 100644
--- a/Sources/SnapshotPreviewsCore/ExpandingViewController.swift
+++ b/Sources/SnapshotPreviewsCore/ExpandingViewController.swift
@@ -78,7 +78,7 @@ public final class ExpandingViewController: UIHostingController<EmergeModifierVi
 
   public override func viewDidLayoutSubviews() {
     super.viewDidLayoutSubviews()
-    self.updateScrollViewHeight()
+    updateScrollViewHeight()
   }
 
   public func updateScrollViewHeight() {
@@ -87,6 +87,11 @@ public final class ExpandingViewController: UIHostingController<EmergeModifierVi
       return
     }
 
+    // Verify scrollview has no pending layout updates
+    if let firstScrollView = firstScrollView as? UIScrollView {
+        firstScrollView.layoutIfNeeded()
+    }
+
     updateHeight {
       runCallback()
     }