diff --git a/src/FormsSettings.vue b/src/FormsSettings.vue
index 170d82f74..479e76b1e 100644
--- a/src/FormsSettings.vue
+++ b/src/FormsSettings.vue
@@ -22,7 +22,7 @@
 				:placeholder="t('forms', 'Select groups')"
 				class="forms-settings__creation__multiselect"
 				label="displayName"
-				@input="onCreationAllowedGroupsChange" />
+				@update:modelValue="onCreationAllowedGroupsChange" />
 		</NcSettingsSection>
 		<NcSettingsSection
 			:name="t('forms', 'Confirmation emails')"
diff --git a/src/components/Questions/Question.vue b/src/components/Questions/Question.vue
index 1b65f7dde..fd9a8147c 100644
--- a/src/components/Questions/Question.vue
+++ b/src/components/Questions/Question.vue
@@ -102,7 +102,7 @@
 						:labelOutside="false"
 						:showTrailingButton="false"
 						:modelValue="name"
-						@input="onNameChange">
+						@update:modelValue="onNameChange">
 						<template #icon>
 							<NcIconSvgWrapper :svg="IconIdentifier" />
 						</template>
@@ -374,8 +374,8 @@ export default {
 			this.$emit('update:description', target.value)
 		},
 
-		onNameChange({ target }) {
-			this.$emit('update:name', target.value)
+		onNameChange(name) {
+			this.$emit('update:name', name)
 		},
 
 		onRequiredChange(isRequired) {
diff --git a/src/components/Questions/QuestionFile.vue b/src/components/Questions/QuestionFile.vue
index 61fa31ff4..bfca0c56b 100644
--- a/src/components/Questions/QuestionFile.vue
+++ b/src/components/Questions/QuestionFile.vue
@@ -18,6 +18,31 @@
 					</template>
 					{{ allowedFileTypesLabel }}
 				</NcActionButton>
+
+				<NcActionInput
+					type="number"
+					:modelValue="maxAllowedFilesCount"
+					labelOutside
+					:label="t('forms', 'Maximum number of files')"
+					:showTrailingButton="false"
+					@update:modelValue="onMaxAllowedFilesCountInput" />
+
+				<NcActionInput
+					type="number"
+					:modelValue="maxFileSizeValue"
+					labelOutside
+					:showTrailingButton="false"
+					:label="t('forms', 'Maximum file size')"
+					@update:modelValue="onMaxFileSizeValueInput" />
+
+				<NcActionInput
+					type="multiselect"
+					:modelValue="maxFileSizeUnit"
+					:options="availableUnits"
+					required
+					:clearable="false"
+					:searchable="false"
+					@update:modelValue="onMaxFileSizeUnitInput" />
 			</template>
 
 			<template v-else>
@@ -41,42 +66,17 @@
 				</NcActionCheckbox>
 
 				<NcActionInput
+					key="allowed-file-extensions-multiselect"
 					:label="t('forms', 'Custom file extensions')"
 					type="multiselect"
 					multiple
 					taggable
-					:modelValue="extraSettings?.allowedFileExtensions || []"
+					:modelValue="allowedFileExtensions"
 					@option:created="onAllowedFileExtensionsAdded"
 					@option:deselected="onAllowedFileExtensionsDeleted" />
 
 				<NcActionSeparator />
 			</template>
-
-			<template v-if="!allowedFileTypesDialogOpened">
-				<NcActionInput
-					type="number"
-					:modelValue="maxAllowedFilesCount"
-					labelOutside
-					:label="t('forms', 'Maximum number of files')"
-					:showTrailingButton="false"
-					@input="onMaxAllowedFilesCountInput($event.target.value)" />
-
-				<NcActionInput
-					type="number"
-					:modelValue="maxFileSizeValue"
-					labelOutside
-					:showTrailingButton="false"
-					:label="t('forms', 'Maximum file size')"
-					@input="onMaxFileSizeValueInput($event.target.value)" />
-
-				<NcActionInput
-					type="multiselect"
-					:modelValue="maxFileSizeUnit"
-					:options="availableUnits"
-					required
-					:clearable="false"
-					@input="onMaxFileSizeUnitInput($event)" />
-			</template>
 		</template>
 
 		<div class="question__content">
@@ -238,6 +238,10 @@ export default {
 			return this.extraSettings?.maxAllowedFilesCount || 1
 		},
 
+		allowedFileExtensions() {
+			return this.extraSettings?.allowedFileExtensions || []
+		},
+
 		allowedFileTypesLabel() {
 			const allowedFileTypes = []
 			if (this.extraSettings?.allowedFileTypes?.length) {
diff --git a/src/components/Questions/QuestionGrid.vue b/src/components/Questions/QuestionGrid.vue
index a1509d857..9fbf7047d 100644
--- a/src/components/Questions/QuestionGrid.vue
+++ b/src/components/Questions/QuestionGrid.vue
@@ -71,11 +71,11 @@
 									<NcInputField
 										type="number"
 										:modelValue="plainValues[row.id][column.id]"
-										@input="
+										@update:modelValue="
 											onChangeTextNumber(
 												row.id,
 												column.id,
-												$event.target.value,
+												$event,
 											)
 										" />
 								</template>