diff --git a/web/NodesView.tsx b/web/NodesView.tsx
index 8ccc1c2..fc5df7b 100644
--- a/web/NodesView.tsx
+++ b/web/NodesView.tsx
@@ -103,6 +103,12 @@ const Ownership = ({ node, busy, onError }: OwnershipProps) => {
     }
   };
 
+  const applyTags = (ev?: React.FormEvent) => {
+    ev?.preventDefault();
+    if (!tagsDirty) return;
+    void run(() => setTags.mutateAsync({ id: node.id, tags: nextTags }));
+  };
+
   return (
     <div className="flex flex-col gap-2.5">
       <div className="text-[10px] font-semibold uppercase tracking-wide text-zinc-500">Owner and tags</div>
@@ -148,13 +154,12 @@ const Ownership = ({ node, busy, onError }: OwnershipProps) => {
         </p>
       )}
 
-      <div className="flex flex-wrap items-center gap-2">
+      <form onSubmit={applyTags} className="flex flex-wrap items-center gap-2">
         <TagIcon className="h-3.5 w-3.5 shrink-0 text-zinc-500" />
         <input
           value={draftTags}
           onChange={(ev) => setDraftTags(ev.target.value)}
           onKeyDown={(ev) => {
-            if (ev.key === 'Enter' && tagsDirty) void run(() => setTags.mutateAsync({ id: node.id, tags: nextTags }));
             if (ev.key === 'Escape') setDraftTags(node.tags.join(' '));
           }}
           placeholder="tag:server tag:eu — space separated"
@@ -164,19 +169,16 @@ const Ownership = ({ node, busy, onError }: OwnershipProps) => {
         />
         {tagsDirty && (
           <>
-            <Button
-              onClick={() => void run(() => setTags.mutateAsync({ id: node.id, tags: nextTags }))}
-              disabled={busy || pending}
-            >
+            <Button type="submit" disabled={busy || pending}>
               <Check className="h-3.5 w-3.5" />
               Apply tags
             </Button>
-            <Button onClick={() => setDraftTags(node.tags.join(' '))} disabled={busy || pending}>
+            <Button type="button" onClick={() => setDraftTags(node.tags.join(' '))} disabled={busy || pending}>
               Revert
             </Button>
           </>
         )}
-      </div>
+      </form>
       <p className="text-[11px] leading-snug text-zinc-600">
         Tags are what the access policy targets. A tag no rule mentions does nothing; removing one a rule depends on
         cuts the node off from it. The <span className="text-zinc-500">tag:</span> prefix is added for you.
@@ -204,7 +206,8 @@ const NodeCard = ({ node, onError }: NodeCardProps) => {
     }
   };
 
-  const submitRename = async () => {
+  const submitRename = async (ev?: React.FormEvent) => {
+    ev?.preventDefault();
     const name = draftName.trim();
     setRenaming(false);
     if (!name || name === node.name) return;
@@ -218,29 +221,24 @@ const NodeCard = ({ node, onError }: NodeCardProps) => {
           <Dot tone={node.online ? 'ok' : 'idle'} />
           <div className="min-w-0 flex-1">
             {renaming ? (
-              <div className="flex items-center gap-1.5">
+              <form onSubmit={submitRename} className="flex items-center gap-1.5">
                 <input
                   value={draftName}
                   onChange={(ev) => setDraftName(ev.target.value)}
                   onKeyDown={(ev) => {
-                    if (ev.key === 'Enter') void submitRename();
                     if (ev.key === 'Escape') setRenaming(false);
                   }}
                   autoFocus
                   spellCheck={false}
                   className="min-w-0 flex-1 rounded-md border border-white/10 bg-black/40 px-2 py-1 text-sm text-zinc-100 outline-none focus:border-primary/50"
                 />
-                <button
-                  type="button"
-                  onClick={() => void submitRename()}
-                  className="cursor-pointer p-1 text-emerald-400"
-                >
+                <button type="submit" className="cursor-pointer p-1 text-emerald-400">
                   <Check className="h-3.5 w-3.5" />
                 </button>
                 <button type="button" onClick={() => setRenaming(false)} className="cursor-pointer p-1 text-zinc-500">
                   <X className="h-3.5 w-3.5" />
                 </button>
-              </div>
+              </form>
             ) : (
               <div className="flex flex-wrap items-center gap-2">
                 <span className="truncate text-sm font-medium text-zinc-100">