diff --git a/src/views/Create.vue b/src/views/Create.vue
index ac51eee99..537b74787 100644
--- a/src/views/Create.vue
+++ b/src/views/Create.vue
@@ -162,11 +162,12 @@
 							<NcActionButton
 								v-for="(answer, type) in answerTypesFilter"
 								:key="answer.label"
-								:close-after-click="!answer.subtypes"
+								:close-after-click="!hasSubtypes(answer)"
 								:disabled="isLoadingQuestions"
+								:is-menu="hasSubtypes(answer)"
 								class="question-menu__question"
 								@click="
-									answer.subtypes
+									hasSubtypes(answer)
 										? (activeQuestionType = type)
 										: addQuestion(type)
 								">
@@ -344,6 +345,11 @@ export default {
 			return filteredAnswerTypes
 		},
 
+		hasSubtypes() {
+			return (answer) =>
+				answer && answer.subtypes && Object.keys(answer.subtypes).length > 0
+		},
+
 		lockedUntilFormatted() {
 			return moment(this.form.lockedUntil, 'X').fromNow()
 		},