diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue
index 70c9a38607e36..ec7d9fa599e7a 100644
--- a/apps/files/src/views/FilesList.vue
+++ b/apps/files/src/views/FilesList.vue
@@ -50,18 +50,6 @@
 
 			<!-- Secondary loading indicator -->
 			<NcLoadingIcon v-if="isRefreshing" class="files-list__refresh-icon" />
-
-			<NcButton v-if="filesListWidth >= 512 && enableGridView"
-				:aria-label="gridViewButtonLabel"
-				:title="gridViewButtonLabel"
-				class="files-list__header-grid-button"
-				type="tertiary"
-				@click="toggleGridView">
-				<template #icon>
-					<ListViewIcon v-if="userConfig.grid_view" />
-					<ViewGridIcon v-else />
-				</template>
-			</NcButton>
 		</div>
 
 		<!-- Drag and drop notice -->
@@ -112,6 +100,18 @@
 			:current-folder="currentFolder"
 			:current-view="currentView"
 			:nodes="dirContentsSorted" />
+
+		<NcButton v-if="filesListWidth >= 512 && enableGridView"
+			:aria-label="gridViewButtonLabel"
+			:title="gridViewButtonLabel"
+			class="files-list__header-grid-button"
+			type="tertiary"
+			@click="toggleGridView">
+			<template #icon>
+				<ListViewIcon v-if="userConfig.grid_view" />
+				<ViewGridIcon v-else />
+			</template>
+		</NcButton>
 	</NcAppContent>
 </template>