diff --git a/packages/taler-merchant-webui/src/screens/CreateProductScreen.tsx b/packages/taler-merchant-webui/src/screens/CreateProductScreen.tsx
index 5e7db1df8..650429d4a 100644
--- a/packages/taler-merchant-webui/src/screens/CreateProductScreen.tsx
+++ b/packages/taler-merchant-webui/src/screens/CreateProductScreen.tsx
@@ -19,7 +19,7 @@ import type { RecordLoss } from "../utils/inventory.js";
 import type { VNode } from "preact";
 import { session } from "../stores/session.js";
 import { Amounts } from "@gnu-taler/taler-util";
-import { useEffect, useState } from "preact/hooks";
+import { useEffect, useRef, useState } from "preact/hooks";
 import { useLocation } from "wouter-preact";
 import { Header } from "../ui/Header.js";
 import { FormActionFooter, useFormFeedback } from "../ui/FormActionFooter.js";
@@ -266,6 +266,12 @@ function CreateProductForm({
 
   // Form State (Spec 07 § 7.2)
   const [name, setName] = useState<string>(existing?.name || "");
+  // A new product starts with its name. When editing, no field in particular
+  // comes first.
+  const nameInput = useRef<HTMLInputElement>(null);
+  useEffect(() => {
+    if (!isEditing) nameInput.current?.focus();
+  }, [isEditing]);
   const [productId, setProductId] = useState<string>(existing?.id || "");
   const [manualId, setManualId] = useState<boolean>(!!existing?.id);
   const [description, setDescription] = useState<string>(
@@ -555,6 +561,7 @@ function CreateProductForm({
                 {t`Product Name`} <span class="text-red-500">*</span>
               </label>
               <input
+                ref={nameInput}
                 {...fieldProps("prod_name_input")}
                 id="prod_name_input"
                 type="text"