diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
index 65bfb1406..bb7f824e4 100644
--- a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
+++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
@@ -54,7 +54,9 @@ final class FlowTemplateCoordinatorBridgePresenter: NSObject {
     func present(from viewController: UIViewController, animated: Bool) {
         let flowTemplateCoordinator = FlowTemplateCoordinator(session: self.session)
         flowTemplateCoordinator.delegate = self
-        viewController.present(flowTemplateCoordinator.toPresentable(), animated: animated, completion: nil)
+        let presentable = flowTemplateCoordinator.toPresentable()
+        presentable.presentationController?.delegate = self
+        viewController.present(presentable, animated: animated, completion: nil)
         flowTemplateCoordinator.start()
         
         self.coordinator = flowTemplateCoordinator
@@ -80,3 +82,13 @@ extension FlowTemplateCoordinatorBridgePresenter: FlowTemplateCoordinatorDelegat
         self.delegate?.flowTemplateCoordinatorBridgePresenterDelegateDidComplete(self)
     }
 }
+
+// MARK: - UIAdaptivePresentationControllerDelegate
+
+extension FlowTemplateCoordinatorBridgePresenter: UIAdaptivePresentationControllerDelegate {
+    
+    func flowTemplateCoordinatorDidComplete(_ presentationController: UIPresentationController) {
+        self.delegate?.flowTemplateCoordinatorBridgePresenterDelegateDidComplete(self)
+    }
+    
+}