diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift
index f9ecc8e0d..6c9612508 100644
--- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift
+++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift
@@ -61,6 +61,15 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
                    options: [UIPageViewControllerOptionInterPageSpacingKey: kSpacingBetweenItems])
         self.dataSource = self
         self.delegate = self
+
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(didBecomeActive),
+                                               name: NSNotification.Name.OWSApplicationDidBecomeActive,
+                                               object: nil)
+    }
+
+    deinit {
+        NotificationCenter.default.removeObserver(self)
     }
 
     @objc
@@ -79,6 +88,14 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
         return navController
     }
 
+    // MARK: - Notifications
+
+    @objc func didBecomeActive() {
+        AssertIsOnMainThread()
+
+        updateContents()
+    }
+
     // MARK: - Subviews
 
     var galleryRailView: GalleryRailView {
@@ -158,8 +175,8 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
 
     private func updateContents() {
         updateNavigationBar()
-        updateControlVisibility()
         updateInputAccessory()
+        updateControlVisibility()
     }
 
     // MARK: - Input Accessory