diff --git a/Passepartout-iOS/Scenes/ServiceViewController.swift b/Passepartout-iOS/Scenes/ServiceViewController.swift
index 11c857e7..488e0f6f 100644
--- a/Passepartout-iOS/Scenes/ServiceViewController.swift
+++ b/Passepartout-iOS/Scenes/ServiceViewController.swift
@@ -35,10 +35,12 @@ class ServiceViewController: UIViewController, TableModelHost {
 
     @IBOutlet private weak var labelWelcome: UILabel!
     
+    @IBOutlet private weak var itemEdit: UIBarButtonItem!
+    
     var profile: ConnectionProfile? {
         didSet {
             title = profile?.id
-            navigationItem.rightBarButtonItem?.isEnabled = (profile?.context == .host)
+            navigationItem.rightBarButtonItem = (profile?.context == .host) ? itemEdit : nil
             reloadModel()
             updateViewsIfNeeded()
         }
diff --git a/Passepartout-iOS/en.lproj/Main.storyboard b/Passepartout-iOS/en.lproj/Main.storyboard
index c36330e4..e4506154 100644
--- a/Passepartout-iOS/en.lproj/Main.storyboard
+++ b/Passepartout-iOS/en.lproj/Main.storyboard
@@ -223,6 +223,7 @@
                         </barButtonItem>
                     </navigationItem>
                     <connections>
+                        <outlet property="itemEdit" destination="gbN-fY-AoW" id="DGl-oS-ZSe"/>
                         <outlet property="labelWelcome" destination="jEt-mV-gjN" id="kaN-fX-eRE"/>
                         <outlet property="tableView" destination="14D-an-pBY" id="qzB-YR-Pss"/>
                         <outlet property="viewWelcome" destination="p0F-IK-RD6" id="pGB-3J-Rwj"/>