diff --git a/Passepartout-iOS/Scenes/Organizer/ShortcutsConnectToViewController.swift b/Passepartout-iOS/Scenes/Organizer/ShortcutsConnectToViewController.swift
index f698e86f..301e1d3d 100644
--- a/Passepartout-iOS/Scenes/Organizer/ShortcutsConnectToViewController.swift
+++ b/Passepartout-iOS/Scenes/Organizer/ShortcutsConnectToViewController.swift
@@ -182,6 +182,10 @@ extension ShortcutsConnectToViewController {
     private func pickProviderLocation() {
         perform(segue: StoryboardSegue.Shortcuts.pickLocationSegueIdentifier)
     }
+    
+    @IBAction private func done() {
+        dismiss(animated: true, completion: nil)
+    }
 }
 
 extension ShortcutsConnectToViewController: ProviderPoolViewControllerDelegate {
@@ -196,6 +200,7 @@ extension ShortcutsConnectToViewController: ProviderPoolViewControllerDelegate {
 @available(iOS 12, *)
 extension ShortcutsConnectToViewController: INUIAddVoiceShortcutViewControllerDelegate {
     func addVoiceShortcutViewController(_ controller: INUIAddVoiceShortcutViewController, didFinishWith voiceShortcut: INVoiceShortcut?, error: Error?) {
+        navigationController?.popViewController(animated: true)
         dismiss(animated: true, completion: nil)
     }
     
diff --git a/Passepartout-iOS/en.lproj/Shortcuts.storyboard b/Passepartout-iOS/en.lproj/Shortcuts.storyboard
index 4e3dae3a..59f8d9e5 100644
--- a/Passepartout-iOS/en.lproj/Shortcuts.storyboard
+++ b/Passepartout-iOS/en.lproj/Shortcuts.storyboard
@@ -102,6 +102,13 @@
                             <outlet property="delegate" destination="zpj-mS-isI" id="zex-yh-op8"/>
                         </connections>
                     </tableView>
+                    <navigationItem key="navigationItem" id="kUu-WC-MJQ">
+                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="done" id="m8u-XK-MLx">
+                            <connections>
+                                <action selector="done" destination="zpj-mS-isI" id="f5U-ko-QS3"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
                     <connections>
                         <segue destination="bPc-ex-Jwe" kind="show" identifier="PickLocationSegueIdentifier" id="ah9-pc-zoh"/>
                     </connections>