diff --git a/packages/taler-exchange-aml-webui/src/components/NewMeasure.tsx b/packages/taler-exchange-aml-webui/src/components/NewMeasure.tsx
index ef87d75bd..df96bc2d6 100644
--- a/packages/taler-exchange-aml-webui/src/components/NewMeasure.tsx
+++ b/packages/taler-exchange-aml-webui/src/components/NewMeasure.tsx
@@ -272,7 +272,14 @@ function NormalMeasureForm({
           </i18n.Translate>
         </p>
       </div>
-      <FormUI design={design} model={form.model} onSubmit={submitMeasure} />
+      {/* Only a new measure needs a name typed first; when editing, the
+          name is locked and the next field is a list that pops open. */}
+      <FormUI
+        design={design}
+        model={form.model}
+        focus={addingNew}
+        onSubmit={submitMeasure}
+      />
       <div class="flex flex-wrap gap-3 border-t border-gray-200 pt-5 dark:border-gray-700">
         <button type="button" onClick={onCancel} class={secondaryButtonClass}>
           <i18n.Translate>Cancel</i18n.Translate>
@@ -461,7 +468,14 @@ function VerificationMeasureForm({
 
   return (
     <div class="space-y-6">
-      <FormUI design={design} model={form.model} onSubmit={submitMeasure} />
+      {/* Only a new measure needs a name typed first; when editing, the
+          name is locked and the next field is a list that pops open. */}
+      <FormUI
+        design={design}
+        model={form.model}
+        focus={addingNew}
+        onSubmit={submitMeasure}
+      />
       <div class="flex flex-wrap gap-3 border-t border-gray-200 pt-5 dark:border-gray-700">
         <button type="button" onClick={onCancel} class={secondaryButtonClass}>
           <i18n.Translate>Cancel</i18n.Translate>