diff --git a/packages/libeufin-bank-webui/src/pages/NewConversionRateClass.tsx b/packages/libeufin-bank-webui/src/pages/NewConversionRateClass.tsx
index 46bf70b3b..e56b830cc 100644
--- a/packages/libeufin-bank-webui/src/pages/NewConversionRateClass.tsx
+++ b/packages/libeufin-bank-webui/src/pages/NewConversionRateClass.tsx
@@ -97,7 +97,7 @@ export function NewConversionRateClass({
           </i18n.Translate>
         </p>
 
-        <ConversionRateClassForm onChange={setSubmitData}>
+        <ConversionRateClassForm focus onChange={setSubmitData}>
           <div class="border-t border-onBackground/10 bg-background/60 px-5 py-4 sm:px-8">
             <OperationError class="mb-4" />
             <div class="flex items-center justify-between gap-x-6">
diff --git a/packages/libeufin-bank-webui/src/pages/admin/ConversionRateClassForm.tsx b/packages/libeufin-bank-webui/src/pages/admin/ConversionRateClassForm.tsx
index 92b26e412..eab51128a 100644
--- a/packages/libeufin-bank-webui/src/pages/admin/ConversionRateClassForm.tsx
+++ b/packages/libeufin-bank-webui/src/pages/admin/ConversionRateClassForm.tsx
@@ -249,7 +249,6 @@ export function ConversionRateClassForm(
             </label>
             <div class="mt-2">
               <input
-                ref={focus ? doAutoFocus : undefined}
                 type="text"
                 class="block w-full disabled:bg-gray-100 rounded-md border-0 py-1.5 text-onBackground shadow-sm ring-1 ring-inset ring-gray-300 data-[error=true]:ring-red-500 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary sm:text-sm sm:leading-6"
                 name="class-description"