diff --git a/Tusker/Screens/Compose/ComposeViewController.swift b/Tusker/Screens/Compose/ComposeViewController.swift
index 63407c9553..4e0b76b452 100644
--- a/Tusker/Screens/Compose/ComposeViewController.swift
+++ b/Tusker/Screens/Compose/ComposeViewController.swift
@@ -405,6 +405,7 @@ class ComposeViewController: UIViewController {
             guard let visibility = visibility else { return }
             self.visibility = visibility
         }
+        alertController.popoverPresentationController?.barButtonItem = visibilityBarButtonItem
         present(alertController, animated: true)
     }