diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue
index 813e014b04254..4e6ab25d2ac22 100644
--- a/apps/files/src/components/FilesListVirtual.vue
+++ b/apps/files/src/components/FilesListVirtual.vue
@@ -8,6 +8,7 @@
 		:data-component="userConfig.grid_view ? FileEntryGrid : FileEntry"
 		data-key="source"
 		:data-sources="nodes"
+		:navigating="navigating"
 		:grid-mode="userConfig.grid_view"
 		:extra-props="{
 			isMimeAvailable,
@@ -47,6 +48,27 @@
 			<slot name="empty" />
 		</template>
 
+		<!-- Loading skeleton while navigating -->
+		<template #navigating>
+			<div class="files-list__loading-skeleton">
+				<!-- Skeleton rows -->
+				<div
+					v-for="index in 5"
+					:key="`skeleton-${index}`"
+					class="files-list__skeleton-row">
+					<!-- Checkbox skeleton -->
+					<div class="files-list__skeleton-checkbox" />
+					<!-- Icon skeleton -->
+					<div class="files-list__skeleton-icon" />
+					<!-- Name skeleton -->
+					<div class="files-list__skeleton-name" />
+					<!-- Other columns skeleton -->
+					<div class="files-list__skeleton-column" />
+					<div class="files-list__skeleton-column" />
+				</div>
+			</div>
+		</template>
+
 		<!-- Tfoot-->
 		<template #footer>
 			<FilesListTableFooter
@@ -82,9 +104,9 @@ import { useEnabledFileActions } from '../composables/useFileActions.ts'
 import { useFileListHeaders } from '../composables/useFileListHeaders.ts'
 import { useFileListWidth } from '../composables/useFileListWidth.ts'
 import { useRouteParameters } from '../composables/useRouteParameters.ts'
+import logger from '../logger.ts'
 import { useActiveStore } from '../store/active.ts'
 import { useUserConfigStore } from '../store/userconfig.ts'
-import { logger } from '../utils/logger.ts'
 
 export default defineComponent({
 	name: 'FilesListVirtual',
@@ -118,6 +140,11 @@ export default defineComponent({
 			type: String,
 			required: true,
 		},
+
+		navigating: {
+			type: Boolean,
+			default: false,
+		},
 	},
 
 	setup(props) {
@@ -578,6 +605,94 @@ export default defineComponent({
 			height: 100%;
 		}
 
+		// Loading skeleton
+		.files-list__loading-skeleton {
+			display: flex;
+			flex-direction: column;
+			width: 100%;
+		}
+
+		.files-list__skeleton-row {
+			display: flex;
+			align-items: center;
+			width: 100%;
+			height: var(--row-height);
+			border-block-end: 1px solid var(--color-border);
+			box-sizing: border-box;
+			gap: 8px;
+			padding: 0 8px;
+		}
+
+		.files-list__skeleton-checkbox {
+			width: 18px;
+			height: 18px;
+			margin: 6px;
+			border-radius: 4px;
+			background: linear-gradient(
+				90deg,
+				var(--color-placeholder-light),
+				var(--color-placeholder-dark),
+				var(--color-placeholder-light)
+			);
+			background-size: 200% 100%;
+			animation: skeleton-loading 3.5s infinite;
+			flex-shrink: 0;
+		}
+
+		.files-list__skeleton-icon {
+			width: 24px;
+			height: 24px;
+			border-radius: 4px;
+			background: linear-gradient(
+				90deg,
+				var(--color-placeholder-light),
+				var(--color-placeholder-dark),
+				var(--color-placeholder-light)
+			);
+			background-size: 200% 100%;
+			animation: skeleton-loading 3.5s infinite;
+			flex-shrink: 0;
+		}
+
+		.files-list__skeleton-name {
+			flex: 1 1 auto;
+			height: 20px;
+			border-radius: 4px;
+			background: linear-gradient(
+				90deg,
+				var(--color-placeholder-light),
+				var(--color-placeholder-dark),
+				var(--color-placeholder-light)
+			);
+			background-size: 200% 100%;
+			animation: skeleton-loading 3.5s infinite;
+			min-width: 100px;
+		}
+
+		.files-list__skeleton-column {
+			width: calc(var(--clickable-area-large) * 2.3);
+			height: 20px;
+			border-radius: 4px;
+			background: linear-gradient(
+				90deg,
+				var(--color-placeholder-light),
+				var(--color-placeholder-dark),
+				var(--color-placeholder-light)
+			);
+			background-size: 200% 100%;
+			animation: skeleton-loading 1.5s infinite;
+			flex-shrink: 0;
+		}
+
+		@keyframes skeleton-loading {
+			0% {
+				background-position: 200% 0;
+			}
+			100% {
+				background-position: -200% 0;
+			}
+		}
+
 		tr {
 			position: relative;
 			display: flex;
diff --git a/apps/files/src/components/VirtualList.vue b/apps/files/src/components/VirtualList.vue
index 9121f55e105e1..64d68d57bc601 100644
--- a/apps/files/src/components/VirtualList.vue
+++ b/apps/files/src/components/VirtualList.vue
@@ -18,17 +18,17 @@
 		</div>
 
 		<div
-			v-if="dataSources.length === 0"
+			v-if="!navigating && dataSources.length === 0"
 			class="files-list__empty">
 			<slot name="empty" />
 		</div>
 
 		<table
-			:aria-hidden="dataSources.length === 0"
-			:inert="dataSources.length === 0"
+			:aria-hidden="dataSources.length === 0 && !navigating"
+			:inert="dataSources.length === 0 && !navigating"
 			class="files-list__table"
 			:class="{
-				'files-list__table--hidden': dataSources.length === 0,
+				'files-list__table--hidden': dataSources.length === 0 && !navigating,
 			}">
 			<!-- Accessibility table caption for screen readers -->
 			<caption v-if="caption" class="hidden-visually">
@@ -42,6 +42,7 @@
 
 			<!-- Body -->
 			<tbody
+				v-if="!navigating"
 				:style="tbodyStyle"
 				class="files-list__tbody"
 				data-cy-files-list-tbody>
@@ -56,12 +57,19 @@
 
 			<!-- Footer -->
 			<tfoot
+				v-if="!navigating"
 				ref="footer"
 				class="files-list__tfoot"
 				data-cy-files-list-tfoot>
 				<slot name="footer" />
 			</tfoot>
 		</table>
+
+		<div
+			v-if="navigating"
+			class="files-list__navigating">
+			<slot name="navigating" />
+		</div>
 	</div>
 </template>
 
@@ -123,6 +131,11 @@ export default defineComponent({
 			type: String,
 			default: '',
 		},
+
+		navigating: {
+			type: Boolean,
+			default: false,
+		},
 	},
 
 	setup() {
diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue
index a57b726a057c5..25fbf858a5834 100644
--- a/apps/files/src/views/FilesList.vue
+++ b/apps/files/src/views/FilesList.vue
@@ -90,6 +90,7 @@
 		<FilesListVirtual
 			v-else
 			ref="filesListVirtual"
+			:navigating="navigating"
 			:current-folder="currentFolder"
 			:current-view="currentView"
 			:nodes="dirContentsSorted"
@@ -190,6 +191,7 @@ import FilesListVirtual from '../components/FilesListVirtual.vue'
 import { useEnabledFileListActions } from '../composables/useFileListActions.ts'
 import { useFileListWidth } from '../composables/useFileListWidth.ts'
 import { useRouteParameters } from '../composables/useRouteParameters.ts'
+import logger from '../logger.ts'
 import filesSortingMixin from '../mixins/filesSorting.ts'
 import { useActiveStore } from '../store/active.ts'
 import { useFilesStore } from '../store/files.ts'
@@ -203,7 +205,6 @@ import { useViewConfigStore } from '../store/viewConfig.ts'
 import { humanizeWebDAVError } from '../utils/davUtils.ts'
 import { defaultView } from '../utils/filesViews.ts'
 import { getSummaryFor } from '../utils/fileUtils.ts'
-import { logger } from '../utils/logger.ts'
 
 export default defineComponent({
 	name: 'FilesList',
@@ -311,6 +312,7 @@ export default defineComponent({
 
 			loading: true,
 			loadingAction: null as string | null,
+			navigating: false,
 			error: null as string | null,
 			controller: new AbortController(),
 			promise: null as Promise<ContentsWithRoot> | null,
@@ -476,6 +478,7 @@ export default defineComponent({
 			}
 
 			logger.debug('View changed', { newView, oldView })
+			this.navigating = true
 			this.selectionStore.reset()
 			this.fetchContent()
 		},
@@ -608,6 +611,7 @@ export default defineComponent({
 				this.error = humanizeWebDAVError(error)
 			} finally {
 				this.loading = false
+				this.navigating = false
 			}
 		},