diff --git a/Tusker/TuskerNavigationDelegate.swift b/Tusker/TuskerNavigationDelegate.swift
index 0d9a41ea..01e7d1a0 100644
--- a/Tusker/TuskerNavigationDelegate.swift
+++ b/Tusker/TuskerNavigationDelegate.swift
@@ -82,12 +82,16 @@ extension TuskerNavigationDelegate where Self: UIViewController {
     }
     
     func compose() {
-        let vc: UINavigationController = UINavigationController(rootViewController: ComposeViewController())
+        let compose = ComposeViewController()
+        let vc = UINavigationController(rootViewController: compose)
+        vc.presentationController?.delegate = compose
         present(vc, animated: true)
     }
     
     func reply(to statusID: String) {
-        let vc = UINavigationController(rootViewController: ComposeViewController(inReplyTo: statusID))
+        let compose = ComposeViewController(inReplyTo: statusID)
+        let vc = UINavigationController(rootViewController: compose)
+        vc.presentationController?.delegate = compose
         present(vc, animated: true)
     }