diff --git a/apps/files_external/src/components/AddExternalStorageDialog/AddExternalStorageDialog.vue b/apps/files_external/src/components/AddExternalStorageDialog/AddExternalStorageDialog.vue
index 7e5613bb9a3a7..df809e3b58ef4 100644
--- a/apps/files_external/src/components/AddExternalStorageDialog/AddExternalStorageDialog.vue
+++ b/apps/files_external/src/components/AddExternalStorageDialog/AddExternalStorageDialog.vue
@@ -93,13 +93,15 @@ watch(authMechanisms, () => {
 		<ApplicableEntities
 			v-if="isAdmin"
 			v-model:groups="internalStorage.applicableGroups"
-			v-model:users="internalStorage.applicableUsers" />
+			v-model:users="internalStorage.applicableUsers"
+			:class="$style.externalStorageDialog__dropdown" />
 
 		<NcSelect
 			v-model="backend"
 			:options="backends"
 			:disabled="!!(internalStorage.id && internalStorage.backend)"
 			:inputLabel="t('files_external', 'External storage')"
+			:class="$style.externalStorageDialog__dropdown"
 			label="name"
 			required />
 
@@ -108,6 +110,7 @@ watch(authMechanisms, () => {
 			:options="authMechanisms"
 			:disabled="!internalStorage.backend || authMechanisms.length <= 1 || !!(internalStorage.id && internalStorage.authMechanism)"
 			:inputLabel="t('files_external', 'Authentication')"
+			:class="$style.externalStorageDialog__dropdown"
 			label="name"
 			required />
 
@@ -146,4 +149,8 @@ watch(authMechanisms, () => {
 .externalStorageDialog__configuration {
 	margin-block: 0.5rem;
 }
+
+.externalStorageDialog__dropdown {
+	flex: 0 0 auto;
+}
 </style>
diff --git a/apps/files_external/src/components/AddExternalStorageDialog/ConfigurationEntry.vue b/apps/files_external/src/components/AddExternalStorageDialog/ConfigurationEntry.vue
index 2e4e4d48d1447..54cbd05819721 100644
--- a/apps/files_external/src/components/AddExternalStorageDialog/ConfigurationEntry.vue
+++ b/apps/files_external/src/components/AddExternalStorageDialog/ConfigurationEntry.vue
@@ -27,12 +27,20 @@ defineProps<{
 		:name="configKey"
 		:required="!(configOption.flags & ConfigurationFlag.Optional)"
 		:label="configOption.value"
-		:title="configOption.tooltip" />
+		:title="configOption.tooltip"
+		:class="$style.configurationEntry" />
 	<NcCheckboxRadioSwitch
 		v-else
 		v-model="value"
 		type="switch"
-		:title="configOption.tooltip">
+		:title="configOption.tooltip"
+		:class="$style.configurationEntry">
 		{{ configOption.value }}
 	</NcCheckboxRadioSwitch>
 </template>
+
+<style module>
+.configurationEntry {
+	flex: 1 0 auto;
+}
+</style>