diff --git a/src/components/ConnectionEditor.tsx b/src/components/ConnectionEditor.tsx
index abf972a..979910f 100644
--- a/src/components/ConnectionEditor.tsx
+++ b/src/components/ConnectionEditor.tsx
@@ -56,10 +56,10 @@ export function ConnectionEditor({ node, onSave, onConnect }: Props) {
       const built: Node = {
         type: "connection",
         id: editingId ?? crypto.randomUUID(),
-        name,
+        name: name.trim(),
         conn: {
           protocol,
-          host,
+          host: host.trim(),
           port: port ? Number(port) : undefined,
           credentials: {
             username: username || undefined,
diff --git a/src/components/FolderEditor.tsx b/src/components/FolderEditor.tsx
index f228989..8c56868 100644
--- a/src/components/FolderEditor.tsx
+++ b/src/components/FolderEditor.tsx
@@ -54,7 +54,7 @@ export function FolderEditor({ node, onSave }: { node: Node | null; onSave: (n:
       const built: Node = {
         type: "folder",
         id: editingId ?? crypto.randomUUID(),
-        name,
+        name: name.trim(),
         defaults: {
           username: username || undefined,
           password: password || undefined,
diff --git a/src/components/TrashPanel.tsx b/src/components/TrashPanel.tsx
index 44eb490..33f8ec7 100644
--- a/src/components/TrashPanel.tsx
+++ b/src/components/TrashPanel.tsx
@@ -30,7 +30,7 @@ export function TrashPanel({ trash, onRestore, onDeleteForever, onEmpty }: Props
           {trash.map((e) => (
             <div key={e.node.id} className="tree-row" style={row}>
               <span style={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", flex: 1 }}>
-                {e.node.type === "folder" ? (e.node.icon ?? "📁") : "🔌"} {e.node.name}
+                {e.node.type === "folder" ? (e.node.icon || "📁") : "🔌"} {e.node.name.trim()}
               </span>
               <button type="button" onClick={() => onRestore(e.node.id)} style={iconBtn} title="Restore">↩</button>
               <button type="button" onClick={() => onDeleteForever(e.node.id)} style={{ ...iconBtn, fontSize: 15 }} title="Delete forever">×</button>