diff --git a/TUI/modalscreen/config_modal.py b/TUI/modalscreen/config_modal.py
index 925223c..504e620 100644
--- a/TUI/modalscreen/config_modal.py
+++ b/TUI/modalscreen/config_modal.py
@@ -762,11 +762,23 @@ class ConfigModal(ModalScreen):
                                 "PORT": "999",
                                 "SERVICE": "remote"
                             }
-                        try:
-                            self.save_all()
-                            self.notify(f"ZeroTier auto-saved: Manual template created.")
-                        except Exception as e:
-                            self.notify(f"Auto-save failed: {e}", severity="error")
+                            try:
+                                self.save_all()
+                                self.notify("ZeroTier manual template created.")
+                            except Exception as e:
+                                self.notify(f"Auto-save failed: {e}", severity="error")
+                            
+                            self.editing_item_type = "store-zerotier"
+                            self.editing_item_name = new_name
+                            self.refresh_view()
+                            return
+
+                        peer_options = []
+                        for p in probes:
+                            peer_name = "Unnamed Peer"
+                            if isinstance(p.payload, dict):
+                                peer_name = p.payload.get("name") or p.payload.get("NAME") or peer_name
+                            peer_options.append(f"{p.address} ({peer_name})")
 
                         def on_peer_selected(peer_choice: str):
                             if not peer_choice: return