diff --git a/src/components/PillMenu.vue b/src/components/PillMenu.vue
index 237fc60ad..2612c801c 100644
--- a/src/components/PillMenu.vue
+++ b/src/components/PillMenu.vue
@@ -27,6 +27,7 @@
 			:key="option.id"
 			:aria-label="isMobile ? option.ariaLabel : null"
 			:checked="active.id"
+			:disabled="disabled"
 			class="pill-menu__toggle"
 			:class="{ 'pill-menu__toggle--icon-only': isMobile && option.icon }"
 			button-variant
@@ -63,6 +64,15 @@ export default {
 			type: Object,
 			required: true,
 		},
+
+		/**
+		 * If the PillMenu is disabled
+		 */
+		disabled: {
+			type: Boolean,
+			required: true,
+		},
+
 		/**
 		 * List of available options
 		 * `option: {id: string, title: string, ariaLabel: string, icon?: string}`
diff --git a/src/views/Results.vue b/src/views/Results.vue
index 39139612f..00505c24e 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -53,49 +53,6 @@
 			</template>
 		</NcEmptyContent>
 
-		<!-- No submissions -->
-		<NcEmptyContent
-			v-else-if="noSubmissions"
-			:name="t('forms', 'No responses yet')"
-			class="forms-emptycontent"
-			:description="
-				t('forms', 'Results of submitted forms will show up here')
-			">
-			<template #icon>
-				<IconPoll :size="64" />
-			</template>
-			<template #action>
-				<div class="response-actions">
-					<NcButton type="primary" @click="onShareForm">
-						<template #icon>
-							<IconShareVariant :size="20" decorative />
-						</template>
-						{{ t('forms', 'Share form') }}
-					</NcButton>
-
-					<NcButton
-						v-if="canEditForm && !form.fileId"
-						type="tertiary-no-background"
-						@click="onLinkFile">
-						<template #icon>
-							<IconLink :size="20" />
-						</template>
-						{{ t('forms', 'Create spreadsheet') }}
-					</NcButton>
-
-					<NcButton
-						v-if="form.fileId"
-						:href="fileUrl"
-						type="tertiary-no-background">
-						<template #icon>
-							<IconTable :size="20" />
-						</template>
-						{{ t('forms', 'Open spreadsheet') }}
-					</NcButton>
-				</div>
-			</template>
-		</NcEmptyContent>
-
 		<!-- Showing submissions -->
 		<template v-else>
 			<header>
@@ -113,6 +70,7 @@
 				<!-- View switcher between Summary and Responses -->
 				<div class="response-actions">
 					<PillMenu
+						:disabled="noSubmissions"
 						:options="responseViews"
 						:active.sync="activeResponseView"
 						class="response-actions__toggle" />
@@ -161,6 +119,7 @@
 								<NcActionSeparator v-if="!noSubmissions" />
 							</template>
 							<NcActionButton
+								v-if="!noSubmissions"
 								close-after-click
 								@click="onStoreToFiles">
 								<template #icon>
@@ -169,6 +128,7 @@
 								{{ t('forms', 'Save copy to Files') }}
 							</NcActionButton>
 							<NcActionButton
+								v-if="!noSubmissions"
 								:close-after-click="false"
 								:is-menu="true"
 								@click="isDownloadActionOpened = true">
@@ -177,9 +137,8 @@
 								</template>
 								{{ t('forms', 'Download') }}
 							</NcActionButton>
-
 							<NcActionButton
-								v-if="canDeleteSubmissions"
+								v-if="canDeleteSubmissions && !noSubmissions"
 								close-after-click
 								@click="deleteAllSubmissions">
 								<template #icon>
@@ -227,8 +186,31 @@
 				</div>
 			</header>
 
+			<!-- No submissions -->
+			<NcEmptyContent
+				v-if="noSubmissions"
+				:name="t('forms', 'No responses yet')"
+				class="forms-emptycontent"
+				:description="
+					t('forms', 'Results of submitted forms will show up here')
+				">
+				<template #icon>
+					<IconPoll :size="64" />
+				</template>
+				<template #action>
+					<div class="response-actions">
+						<NcButton type="primary" @click="onShareForm">
+							<template #icon>
+								<IconShareVariant :size="20" decorative />
+							</template>
+							{{ t('forms', 'Share form') }}
+						</NcButton>
+					</div>
+				</template>
+			</NcEmptyContent>
+
 			<!-- Summary view for visualization -->
-			<section v-if="activeResponseView.id === 'summary'">
+			<section v-else-if="activeResponseView.id === 'summary'">
 				<ResultsSummary
 					v-for="question in questions"
 					:key="question.id"