diff --git a/src/ui/desktop/apps/host-manager/HostManager.tsx b/src/ui/desktop/apps/host-manager/HostManager.tsx
index 284ad37f..dc37723b 100644
--- a/src/ui/desktop/apps/host-manager/HostManager.tsx
+++ b/src/ui/desktop/apps/host-manager/HostManager.tsx
@@ -42,6 +42,15 @@ export function HostManager({
     }
   }, [initialTab]);
 
+  // Update editingHost when hostConfig changes
+  useEffect(() => {
+    if (hostConfig) {
+      setEditingHost(hostConfig);
+      setActiveTab("add_host");
+      lastProcessedHostIdRef.current = hostConfig.id;
+    }
+  }, [hostConfig?.id]);
+
   const handleEditHost = (host: SSHHost) => {
     setEditingHost(host);
     setActiveTab("add_host");