diff --git a/src/components/Calendar/CalendarModal.tsx b/src/components/Calendar/CalendarModal.tsx
index 2fc81e9..ffc6be9 100644
--- a/src/components/Calendar/CalendarModal.tsx
+++ b/src/components/Calendar/CalendarModal.tsx
@@ -366,6 +366,7 @@ function CalendarPopover({
           visibility={visibility}
           setVisibility={setVisibility}
           calendar={calendar}
+          autoFocusName={!calendar}
         />
       )}
       {tab === 'access' && calendar && (
diff --git a/src/components/Calendar/CalendarResources.tsx b/src/components/Calendar/CalendarResources.tsx
index 2c0066b..e9f1c94 100644
--- a/src/components/Calendar/CalendarResources.tsx
+++ b/src/components/Calendar/CalendarResources.tsx
@@ -263,7 +263,7 @@ export default function CalendarResources({
       <ResourceSearch
         objectTypes={['resource']}
         selectedResources={selectedResources}
-        inputSlot={params => <TextField {...params} size="small" />}
+        inputSlot={params => <TextField {...params} size="small" autoFocus />}
         onChange={async (_event: React.SyntheticEvent, value: Resource[]) => {
           const requestSeq = ++fetchSeqRef.current
           setSelectedResources(value)
diff --git a/src/components/Calendar/CalendarSearch.tsx b/src/components/Calendar/CalendarSearch.tsx
index 0521b89..74324ac 100644
--- a/src/components/Calendar/CalendarSearch.tsx
+++ b/src/components/Calendar/CalendarSearch.tsx
@@ -283,7 +283,7 @@ export default function CalendarSearch({
       <PeopleSearch
         objectTypes={['user']}
         selectedUsers={selectedUsers}
-        inputSlot={params => <TextField {...params} size="small" />}
+        inputSlot={params => <TextField {...params} size="small" autoFocus />}
         onChange={async (_event: React.SyntheticEvent, value: User[]) => {
           setSelectedUsers(value)
 
diff --git a/src/components/Calendar/SettingsTab.tsx b/src/components/Calendar/SettingsTab.tsx
index 527d0c8..00d54b7 100644
--- a/src/components/Calendar/SettingsTab.tsx
+++ b/src/components/Calendar/SettingsTab.tsx
@@ -28,7 +28,8 @@ export function SettingsTab({
   setColor,
   visibility,
   setVisibility,
-  calendar
+  calendar,
+  autoFocusName
 }: {
   name: string
   setName: (name: string) => void
@@ -39,6 +40,7 @@ export function SettingsTab({
   visibility: 'public' | 'private'
   setVisibility: (visibility: 'public' | 'private') => void
   calendar?: Calendar
+  autoFocusName?: boolean
 }) {
   const { t } = useI18n()
   const [toggleDesc, setToggleDesc] = useState(Boolean(description))
@@ -93,6 +95,7 @@ export function SettingsTab({
             <TextField
               fullWidth
               label=""
+              autoFocus={autoFocusName}
               inputProps={{ 'aria-label': t('common.name') }}
               placeholder={t('common.name')}
               value={name}