diff --git a/Signal/src/ViewControllers/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaPageViewController.swift
index 7fa304f00..6dab1a13d 100644
--- a/Signal/src/ViewControllers/MediaPageViewController.swift
+++ b/Signal/src/ViewControllers/MediaPageViewController.swift
@@ -181,8 +181,8 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
 
         self.view.addSubview(bottomContainer)
         bottomContainer.autoPinWidthToSuperview()
-        bottomContainer.autoPinEdge(toSuperviewSafeArea: .bottom)
-        footerBar.autoPinEdge(toSuperviewSafeArea: .bottom)
+        bottomContainer.autoPinEdge(.bottom, to: .bottom, of: view)
+        footerBar.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor).isActive = true
         footerBar.autoSetDimension(.height, toSize: 44)
 
         updateTitle()
diff --git a/Signal/src/ViewControllers/MediaTileViewController.swift b/Signal/src/ViewControllers/MediaTileViewController.swift
index 57d4398d1..f30cff72a 100644
--- a/Signal/src/ViewControllers/MediaTileViewController.swift
+++ b/Signal/src/ViewControllers/MediaTileViewController.swift
@@ -533,7 +533,7 @@ public class MediaTileViewController: UICollectionViewController, MediaGalleryDa
         // show toolbar
         UIView.animate(withDuration: 0.1, delay: 0, options: .curveEaseInOut, animations: {
             NSLayoutConstraint.deactivate([self.footerBarBottomConstraint])
-            self.footerBarBottomConstraint = self.footerBar.autoPinEdge(.bottom, to: .bottom, of: self.view)
+            self.footerBarBottomConstraint = self.footerBar.autoPinEdge(toSuperviewSafeArea: .bottom)
 
             self.footerBar.superview?.layoutIfNeeded()