diff --git a/webapp/src/components/Params.tsx b/webapp/src/components/Params.tsx
index 5ffcce1..ebb5c6c 100644
--- a/webapp/src/components/Params.tsx
+++ b/webapp/src/components/Params.tsx
@@ -43,6 +43,11 @@ export function Params({ params, onDeclared }: { params: ParamDeclaration[]; onD
   const [submitError, setSubmitError] = useState<string | null>(null)
   const [submitting, setSubmitting] = useState(false)
   const [collapsed, setCollapsed] = useSectionCollapsed('params')
+  // Name of the declaration currently loaded into the form for editing, or `null` when the form is
+  // declaring a brand-new param. The name field is locked while editing — `declareParam` overwrites
+  // in place by name, so changing it here would silently create a second param and orphan the
+  // original (and anything referencing it by name) rather than renaming it.
+  const [editingName, setEditingName] = useState<string | null>(null)
 
   const isBoolean = kind === 'boolean'
   const isElapsedSinceLast = source === 'elapsed_since_last'
@@ -63,6 +68,30 @@ export function Params({ params, onDeclared }: { params: ParamDeclaration[]; onD
     if (next === 'elapsed_since_last') setKind('duration')
   }
 
+  function resetForm() {
+    setEditingName(null)
+    setName('')
+    setRegex('')
+    setCaptureGroup('')
+    setJsonFieldPath('')
+    setSource('regex')
+    setKind(EMPTY_KIND)
+    setSubmitError(null)
+  }
+
+  // Loads `param`'s current values into the declaration form for editing — a click handler for a
+  // declared-param badge.
+  function editParam(param: ParamDeclaration) {
+    setEditingName(param.name)
+    setName(param.name)
+    setRegex(param.message_match_regex)
+    setCaptureGroup(param.capture_group)
+    setJsonFieldPath(param.json_field_path ?? '')
+    setSource(param.elapsed_since_last ? 'elapsed_since_last' : param.json_field_path ? 'json_field' : 'regex')
+    setKind(param.kind)
+    setSubmitError(null)
+  }
+
   async function handleSubmit(e: React.FormEvent) {
     e.preventDefault()
     setSubmitError(null)
@@ -79,15 +108,10 @@ export function Params({ params, onDeclared }: { params: ParamDeclaration[]; onD
         kind: effectiveSource === 'elapsed_since_last' ? 'duration' : kind,
         elapsed_since_last: effectiveSource === 'elapsed_since_last',
       })
-      setName('')
-      setRegex('')
-      setCaptureGroup('')
-      setJsonFieldPath('')
-      setSource('regex')
-      setKind(EMPTY_KIND)
+      resetForm()
       onDeclared()
     } catch (err) {
-      setSubmitError(err instanceof ApiError ? err.message : 'Failed to declare param')
+      setSubmitError(err instanceof ApiError ? err.message : `Failed to ${editingName ? 'update' : 'declare'} param`)
     } finally {
       setSubmitting(false)
     }
@@ -115,13 +139,16 @@ export function Params({ params, onDeclared }: { params: ParamDeclaration[]; onD
       <div className="flex gap-4 p-3" hidden={collapsed}>
         <form onSubmit={handleSubmit} className="w-80 shrink-0 space-y-2">
           <div>
-            <label className="mb-1 block text-xs text-text-subtle">Name</label>
+            <label className="mb-1 block text-xs text-text-subtle">
+              Name{editingName && ' (locked while editing)'}
+            </label>
             <input
-              className="w-full rounded border border-border-soft bg-surface-1 px-2 py-1 text-sm text-text placeholder:text-text-subtle focus:border-border-strong focus:outline-none"
+              className="w-full rounded border border-border-soft bg-surface-1 px-2 py-1 text-sm text-text placeholder:text-text-subtle focus:border-border-strong focus:outline-none disabled:opacity-50"
               value={name}
               onChange={(e) => setName(e.target.value)}
               placeholder="path"
               required
+              disabled={editingName !== null}
             />
           </div>
           {!isElapsedSinceLast && (
@@ -207,14 +234,31 @@ export function Params({ params, onDeclared }: { params: ParamDeclaration[]; onD
               </select>
             </div>
           )}
+          {editingName && (
+            <div className="rounded border border-accent bg-accent/5 px-2 py-1 text-xs text-accent-text">
+              Editing "{editingName}"
+            </div>
+          )}
           {submitError && <div className="rounded border border-danger-border bg-danger-bg/50 px-2 py-1 text-xs text-danger-text">{submitError}</div>}
-          <button
-            type="submit"
-            disabled={submitting}
-            className="rounded border border-border-soft px-3 py-1 text-sm text-text-secondary hover:bg-surface-2 disabled:opacity-50"
-          >
-            {submitting ? 'Declaring…' : 'Declare param'}
-          </button>
+          <div className="flex items-center gap-2">
+            <button
+              type="submit"
+              disabled={submitting}
+              className="rounded border border-border-soft px-3 py-1 text-sm text-text-secondary hover:bg-surface-2 disabled:opacity-50"
+            >
+              {submitting ? (editingName ? 'Saving…' : 'Declaring…') : editingName ? 'Save changes' : 'Declare param'}
+            </button>
+            {editingName && (
+              <button
+                type="button"
+                onClick={resetForm}
+                disabled={submitting}
+                className="rounded border border-border-soft px-3 py-1 text-sm text-text-secondary hover:bg-surface-2 disabled:opacity-50"
+              >
+                Cancel
+              </button>
+            )}
+          </div>
         </form>
 
         <div className="min-w-0 flex-1">
@@ -222,9 +266,15 @@ export function Params({ params, onDeclared }: { params: ParamDeclaration[]; onD
           <div className="flex flex-wrap gap-1">
             {params.length === 0 && <span className="text-xs text-text-faint">No params declared yet.</span>}
             {params.map((p) => (
-              <span
+              <button
                 key={p.name}
-                className="rounded border border-border-soft px-2 py-1 text-xs text-text-secondary"
+                type="button"
+                onClick={() => editParam(p)}
+                className={`rounded border px-2 py-1 text-xs ${
+                  editingName === p.name
+                    ? 'border-accent bg-accent/10 text-accent-text'
+                    : 'border-border-soft text-text-secondary hover:bg-surface-2'
+                }`}
                 title={p.elapsed_since_last ? undefined : p.message_match_regex}
               >
                 {p.name} ({p.kind}
@@ -234,7 +284,7 @@ export function Params({ params, onDeclared }: { params: ParamDeclaration[]; onD
                     ? ''
                     : `, ${p.json_field_path ? `json field ${p.json_field_path}` : `group ${p.capture_group}`}`}
                 )
-              </span>
+              </button>
             ))}
           </div>
         </div>