diff --git a/Tusker/Screens/Attachment Gallery/GalleryViewController.swift b/Tusker/Screens/Attachment Gallery/GalleryViewController.swift
index a0211ba1..321647fe 100644
--- a/Tusker/Screens/Attachment Gallery/GalleryViewController.swift	
+++ b/Tusker/Screens/Attachment Gallery/GalleryViewController.swift	
@@ -136,6 +136,11 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
             vc.player?.play()
         }
     }
+    
+    override func accessibilityPerformEscape() -> Bool {
+        dismiss(animated: true)
+        return true
+    }
 
     // MARK: - Page View Controller Data Source
     
diff --git a/Tusker/Screens/Large Image/LargeImageViewController.swift b/Tusker/Screens/Large Image/LargeImageViewController.swift
index 2abed9d0..66d206b0 100644
--- a/Tusker/Screens/Large Image/LargeImageViewController.swift	
+++ b/Tusker/Screens/Large Image/LargeImageViewController.swift	
@@ -21,6 +21,7 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
     @IBOutlet weak var descriptionLabel: UILabel!
     
     private var shareContainer: UIView!
+    private var closeContainer: UIView!
     private var shareImage: UIImageView!
     private var shareButtonTopConstraint: NSLayoutConstraint!
     private var shareButtonLeadingConstraint: NSLayoutConstraint!
@@ -116,6 +117,12 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
         view.addGestureRecognizer(doubleTap)
         
         NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)
+        
+        accessibilityElements = [
+            topControlsView!,
+            contentView,
+            bottomControlsView!,
+        ]
     }
     
     private func setupContentView() {
@@ -135,6 +142,9 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
     
     private func setupControls() {
         shareContainer = UIView()
+        shareContainer.isAccessibilityElement = true
+        shareContainer.accessibilityTraits = .button
+        shareContainer.accessibilityLabel = "Share"
         shareContainer.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(sharePressed)))
         shareContainer.translatesAutoresizingMaskIntoConstraints = false
         topControlsView.addSubview(shareContainer)
@@ -161,7 +171,10 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
             shareImage.heightAnchor.constraint(equalToConstant: 24),
         ])
         
-        let closeContainer = UIView()
+        closeContainer = UIView()
+        closeContainer.isAccessibilityElement = true
+        closeContainer.accessibilityTraits = .button
+        closeContainer.accessibilityLabel = "Close"
         closeContainer.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(closeButtonPressed)))
         closeContainer.translatesAutoresizingMaskIntoConstraints = false
         topControlsView.addSubview(closeContainer)