diff --git a/app/src/modules/files/components/add-folder.vue b/app/src/modules/files/components/add-folder.vue
index 617753123e..eee642e75f 100644
--- a/app/src/modules/files/components/add-folder.vue
+++ b/app/src/modules/files/components/add-folder.vue
@@ -9,7 +9,7 @@
 		<v-card>
 			<v-card-title>{{ $t('create_folder') }}</v-card-title>
 			<v-card-text>
-				<v-input :placeholder="$t('folder_name')" v-model="newFolderName" />
+				<v-input autofocus @keyup.enter="addFolder" :placeholder="$t('folder_name')" v-model="newFolderName" />
 			</v-card-text>
 			<v-card-actions>
 				<v-button secondary @click="dialogActive = false">{{ $t('cancel') }}</v-button>
diff --git a/app/src/modules/settings/routes/data-model/new-collection.vue b/app/src/modules/settings/routes/data-model/new-collection.vue
index 49be85b0eb..4d01df592a 100644
--- a/app/src/modules/settings/routes/data-model/new-collection.vue
+++ b/app/src/modules/settings/routes/data-model/new-collection.vue
@@ -27,7 +27,13 @@
 			<v-tab-item value="collection">
 				<h2 class="type-title">{{ $t('creating_collection_info') }}</h2>
 				<div class="type-label">{{ $t('name') }}</div>
-				<v-input class="monospace" v-model="collectionName" db-safe :placeholder="$t('a_unique_table_name')" />
+				<v-input
+					autofocus
+					class="monospace"
+					v-model="collectionName"
+					db-safe
+					:placeholder="$t('a_unique_table_name')"
+				/>
 				<v-divider />
 				<div class="grid">
 					<div>