diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/AddIntegrationModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/AddIntegrationModal.tsx
index 1d08c035ad..94254fa31a 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/AddIntegrationModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/AddIntegrationModal.tsx
@@ -63,6 +63,7 @@ const AddIntegrationModal: React.FC<RoutingModalProps> = () => {
                 marginTop={false}
             >
                 <TextField
+                    autoFocus={true}
                     error={!!errors.name}
                     hint={errors.name}
                     placeholder='Custom integration'
diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/AddNewsletterModal.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/AddNewsletterModal.tsx
index d3b6e8d3d2..65ffa51797 100644
--- a/apps/admin-x-settings/src/components/settings/email/newsletters/AddNewsletterModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/newsletters/AddNewsletterModal.tsx
@@ -26,7 +26,7 @@ const AddNewsletterModal: React.FC<RoutingModalProps> = () => {
     });
 
     const {mutateAsync: addNewsletter} = useAddNewsletter();
-    const {formState, updateForm, handleSave, errors, validate, clearError} = useForm({
+    const {formState, updateForm, handleSave, errors, clearError} = useForm({
         initialState: {
             name: '',
             description: '',
@@ -96,12 +96,12 @@ const AddNewsletterModal: React.FC<RoutingModalProps> = () => {
             marginTop
         >
             <TextField
+                autoFocus={true}
                 error={Boolean(errors.name)}
                 hint={errors.name}
                 placeholder='Weekly roundup'
                 title='Name'
                 value={formState.name}
-                onBlur={validate}
                 onChange={e => updateForm(state => ({...state, name: e.target.value}))}
                 onKeyDown={() => clearError('name')}
             />