diff --git a/src/components/Questions/QuestionFile.vue b/src/components/Questions/QuestionFile.vue
index 1feb22ee4..99857c9f7 100644
--- a/src/components/Questions/QuestionFile.vue
+++ b/src/components/Questions/QuestionFile.vue
@@ -80,6 +80,10 @@
 			</template>
 		</template>
 
+		<NcNoteCard v-if="hasError" :id="errorId" type="error">
+			{{ errorMessage }}
+		</NcNoteCard>
+
 		<div class="question__content">
 			<ul>
 				<NcListItem
@@ -158,6 +162,7 @@ import NcActionSeparator from '@nextcloud/vue/components/NcActionSeparator'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcListItem from '@nextcloud/vue/components/NcListItem'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
+import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
 import IconChevronLeft from 'vue-material-design-icons/ChevronLeft.vue'
 import IconFileDocumentAlert from 'vue-material-design-icons/FileDocumentAlertOutline.vue'
 import IconFile from 'vue-material-design-icons/FileOutline.vue'
@@ -202,6 +207,7 @@ export default {
 		NcButton,
 		NcListItem,
 		NcLoadingIcon,
+		NcNoteCard,
 		Question,
 	},
 
@@ -211,6 +217,7 @@ export default {
 	data() {
 		return {
 			fileTypes,
+			errorMessage: null,
 			fileLoading: false,
 			maxFileSizeUnit: Object.keys(FILE_SIZE_UNITS)[0],
 			maxFileSizeValue: '',
@@ -249,6 +256,14 @@ export default {
 
 			return t('forms', 'All file types are allowed.')
 		},
+
+		hasError() {
+			return !!this.errorMessage
+		},
+
+		errorId() {
+			return `q${this.index}_error`
+		},
 	},
 
 	mounted() {
@@ -404,6 +419,18 @@ export default {
 
 			this.$emit('update:values', values)
 		},
+
+		async validate() {
+			if (this.fileLoading) {
+				this.errorMessage = t(
+					'forms',
+					'Please wait until the file has been uploaded.',
+				)
+				return false
+			}
+			this.errorMessage = null
+			return true
+		},
 	},
 }
 </script>
diff --git a/src/views/Create.vue b/src/views/Create.vue
index 537b74787..d2f1dba33 100644
--- a/src/views/Create.vue
+++ b/src/views/Create.vue
@@ -457,6 +457,7 @@ export default {
 		 * @param {string|null} subtype the question subtype, see AnswerTypes.subtypes
 		 */
 		async addQuestion(type, subtype = null) {
+			this.activeQuestionType = null
 			const text = ''
 			this.isLoadingQuestions = true