diff --git a/apps/files/src/components/FileEntry.vue b/apps/files/src/components/FileEntry.vue
index e8d8d00d36566..7fa92679811eb 100644
--- a/apps/files/src/components/FileEntry.vue
+++ b/apps/files/src/components/FileEntry.vue
@@ -104,13 +104,13 @@
 import type { PropType } from 'vue'
 
 import { extname, join } from 'path'
-import { FileType, formatFileSize, Permission, Folder, File as NcFile, NodeStatus, Node, View } from '@nextcloud/files'
+import { FileType, formatFileSize, Permission, Folder, File as NcFile, NodeStatus, Node as NcNode, View, Navigation } from '@nextcloud/files'
 import { getUploader } from '@nextcloud/upload'
 import { showError } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
 import { vOnClickOutside } from '@vueuse/components'
 import moment from '@nextcloud/moment'
-import Vue from 'vue'
+import Vue, { defineComponent } from 'vue'
 
 import { action as sidebarAction } from '../actions/sidebarAction.ts'
 import { getDragAndDropPreview } from '../utils/dragUtils.ts'
@@ -132,7 +132,7 @@ import logger from '../logger.js'
 
 Vue.directive('onClickOutside', vOnClickOutside)
 
-export default Vue.extend({
+export default defineComponent({
 	name: 'FileEntry',
 
 	components: {
@@ -154,11 +154,11 @@ export default Vue.extend({
 			default: false,
 		},
 		source: {
-			type: [Folder, NcFile, Node] as PropType<Node>,
+			type: [Folder, NcFile, NcNode] as PropType<NcNode>,
 			required: true,
 		},
 		nodes: {
-			type: Array as PropType<Node[]>,
+			type: Array as PropType<NcNode[]>,
 			required: true,
 		},
 		filesListWidth: {
@@ -194,8 +194,8 @@ export default Vue.extend({
 	},
 
 	computed: {
-		currentView(): View {
-			return this.$navigation.active as View
+		currentView() {
+			return (this.$navigation as Navigation).active
 		},
 		columns() {
 			// Hide columns if the list is too small
@@ -213,7 +213,7 @@ export default Vue.extend({
 			return this.$route.params?.fileid || this.$route.query?.fileid || null
 		},
 		fileid() {
-			return this.source?.fileid?.toString?.()
+			return this.source?.fileid
 		},
 		uniqueId() {
 			return hashCode(this.source.source)
@@ -238,7 +238,7 @@ export default Vue.extend({
 		},
 
 		size() {
-			const size = parseInt(this.source.size, 10) || 0
+			const size = this.source.size ?? 0
 			if (typeof size !== 'number' || size < 0) {
 				return t('files', 'Pending')
 			}
@@ -247,12 +247,12 @@ export default Vue.extend({
 		sizeOpacity() {
 			const maxOpacitySize = 10 * 1024 * 1024
 
-			const size = parseInt(this.source.size, 10) || 0
+			const size = this.source.size ?? 0
 			if (!size || size < 0) {
 				return {}
 			}
 
-			const ratio = Math.round(Math.min(100, 100 * Math.pow((this.source.size / maxOpacitySize), 2)))
+			const ratio = Math.round(Math.min(100, 100 * Math.pow(((this.source.size ?? 0) / maxOpacitySize), 2)))
 			return {
 				color: `color-mix(in srgb, var(--color-main-text) ${ratio}%, var(--color-text-maxcontrast))`,
 			}
@@ -288,7 +288,7 @@ export default Vue.extend({
 			return this.selectionStore.selected
 		},
 		isSelected() {
-			return this.selectedFiles.includes(this.fileid)
+			return this.fileid !== undefined && this.selectedFiles.includes(this.fileid)
 		},
 
 		isRenaming() {
@@ -303,13 +303,13 @@ export default Vue.extend({
 		},
 
 		canDrag() {
-			const canDrag = (node: Node): boolean => {
+			const canDrag = (node: NcNode): boolean => {
 				return (node?.permissions & Permission.UPDATE) !== 0
 			}
 
 			// If we're dragging a selection, we need to check all files
 			if (this.selectedFiles.length > 0) {
-				const nodes = this.selectedFiles.map(fileid => this.filesStore.getNode(fileid)) as Node[]
+				const nodes = this.selectedFiles.map(fileid => this.filesStore.getNode(fileid)) as NcNode[]
 				return nodes.every(canDrag)
 			}
 			return canDrag(this.source)
@@ -321,7 +321,7 @@ export default Vue.extend({
 			}
 
 			// If the current folder is also being dragged, we can't drop it on itself
-			if (this.draggingFiles.includes(this.fileid)) {
+			if (this.fileid !== undefined && this.draggingFiles.includes(this.fileid)) {
 				return false
 			}
 
@@ -357,7 +357,7 @@ export default Vue.extend({
 			// Reset loading state
 			this.loading = ''
 
-			this.$refs.preview.reset()
+			this.$refs.preview?.reset?.()
 
 			// Close menu
 			this.openedMenu = false
@@ -380,19 +380,23 @@ export default Vue.extend({
 		},
 
 		execDefaultAction(...args) {
-			this.$refs.actions.execDefaultAction(...args)
+			this.$refs.actions?.execDefaultAction?.(...args)
 		},
 
 		openDetailsIfAvailable(event) {
 			event.preventDefault()
 			event.stopPropagation()
-			if (sidebarAction?.enabled?.([this.source], this.currentView)) {
+			if (this.currentView && sidebarAction?.enabled?.([this.source], this.currentView)) {
 				sidebarAction.exec(this.source, this.currentView, this.currentDir)
 			}
 		},
 
 		onDragOver(event: DragEvent) {
 			this.dragover = this.canDrop
+			if (!event.dataTransfer) {
+				return
+			}
+
 			if (!this.canDrop) {
 				event.dataTransfer.dropEffect = 'none'
 				return
@@ -431,14 +435,16 @@ export default Vue.extend({
 
 			// Dragging set of files, if we're dragging a file
 			// that is already selected, we use the entire selection
-			if (this.selectedFiles.includes(this.fileid)) {
-				this.draggingStore.set(this.selectedFiles)
-			} else {
-				this.draggingStore.set([this.fileid])
+			if (this.fileid !== undefined) {
+				if (this.selectedFiles.includes(this.fileid)) {
+					this.draggingStore.set(this.selectedFiles)
+				} else {
+					this.draggingStore.set([this.fileid])
+				}
 			}
 
 			const nodes = this.draggingStore.dragging
-				.map(fileid => this.filesStore.getNode(fileid)) as Node[]
+				.map(fileid => this.filesStore.getNode(fileid)) as NcNode[]
 
 			const image = await getDragAndDropPreview(nodes)
 			event.dataTransfer?.setDragImage(image, -10, -10)
@@ -474,18 +480,18 @@ export default Vue.extend({
 				return
 			}
 
-			const nodes = this.draggingFiles.map(fileid => this.filesStore.getNode(fileid)) as Node[]
-			nodes.forEach(async (node: Node) => {
+			const nodes = this.draggingFiles.map(fileid => this.filesStore.getNode(fileid)) as NcNode[]
+			nodes.forEach(async (node: NcNode) => {
 				Vue.set(node, 'status', NodeStatus.LOADING)
 				try {
 					// TODO: resolve potential conflicts prior and force overwrite
-					await handleCopyMoveNodeTo(node, this.source, isCopy ? MoveCopyAction.COPY : MoveCopyAction.MOVE)
+					await handleCopyMoveNodeTo(node, this.source as Folder, isCopy ? MoveCopyAction.COPY : MoveCopyAction.MOVE)
 				} catch (error) {
 					logger.error('Error while moving file', { error })
 					if (isCopy) {
-						showError(t('files', 'Could not copy {file}. {message}', { file: node.basename, message: error.message || '' }))
+						showError(t('files', 'Could not copy {file}. {message}', { file: node.basename, message: (error as Error).message || '' }))
 					} else {
-						showError(t('files', 'Could not move {file}. {message}', { file: node.basename, message: error.message || '' }))
+						showError(t('files', 'Could not move {file}. {message}', { file: node.basename, message: (error as Error).message || '' }))
 					}
 				} finally {
 					Vue.set(node, 'status', undefined)
diff --git a/apps/files/src/components/FileEntry/FileEntryCheckbox.vue b/apps/files/src/components/FileEntry/FileEntryCheckbox.vue
index 961e4bf226605..f3996585052dc 100644
--- a/apps/files/src/components/FileEntry/FileEntryCheckbox.vue
+++ b/apps/files/src/components/FileEntry/FileEntryCheckbox.vue
@@ -30,9 +30,11 @@
 </template>
 
 <script lang="ts">
-import { Node } from '@nextcloud/files'
+import type { Node } from '@nextcloud/files'
+import type { PropType } from 'vue'
+
 import { translate as t } from '@nextcloud/l10n'
-import Vue, { PropType } from 'vue'
+import { defineComponent } from 'vue'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
@@ -41,7 +43,7 @@ import { useKeyboardStore } from '../../store/keyboard.ts'
 import { useSelectionStore } from '../../store/selection.ts'
 import logger from '../../logger.js'
 
-export default Vue.extend({
+export default defineComponent({
 	name: 'FileEntryCheckbox',
 
 	components: {
@@ -55,7 +57,7 @@ export default Vue.extend({
 			required: true,
 		},
 		fileid: {
-			type: String,
+			type: Number,
 			required: true,
 		},
 		isLoading: {
@@ -85,12 +87,17 @@ export default Vue.extend({
 			return this.selectedFiles.includes(this.fileid)
 		},
 		index() {
-			return this.nodes.findIndex((node: Node) => node.fileid === parseInt(this.fileid))
+			return this.nodes.findIndex((node: Node) => node.fileid === this.fileid)
 		},
 	},
 
 	methods: {
 		onSelectionChange(selected: boolean) {
+			// eslint-disable-next-line jsdoc/require-jsdoc
+			function isNumber(value: unknown): value is number {
+				return typeof value === 'number'
+			}
+
 			const newSelectedIndex = this.index
 			const lastSelectedIndex = this.selectionStore.lastSelectedIndex
 
@@ -103,8 +110,9 @@ export default Vue.extend({
 
 				const lastSelection = this.selectionStore.lastSelection
 				const filesToSelect = this.nodes
-					.map(file => file.fileid?.toString?.())
+					.map(file => file.fileid)
 					.slice(start, end + 1)
+					.filter(isNumber)
 
 				// If already selected, update the new selection _without_ the current file
 				const selection = [...lastSelection, ...filesToSelect]
diff --git a/apps/files/src/components/FileEntryGrid.vue b/apps/files/src/components/FileEntryGrid.vue
index def818eea2f34..2ca033457bc3a 100644
--- a/apps/files/src/components/FileEntryGrid.vue
+++ b/apps/files/src/components/FileEntryGrid.vue
@@ -74,14 +74,15 @@
 
 <script lang="ts">
 import type { PropType } from 'vue'
+import type { Navigation } from '@nextcloud/files'
 
 import { extname, join } from 'path'
-import { FileType, Permission, Folder, File as NcFile, NodeStatus, Node, View } from '@nextcloud/files'
+import { FileType, File as NcFile, Folder, Permission, Node as NcNode, NodeStatus } from '@nextcloud/files'
 import { getUploader } from '@nextcloud/upload'
 import { showError } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
 import { vOnClickOutside } from '@vueuse/components'
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
 import { action as sidebarAction } from '../actions/sidebarAction.ts'
 import { getDragAndDropPreview } from '../utils/dragUtils.ts'
@@ -99,9 +100,7 @@ import FileEntryName from './FileEntry/FileEntryName.vue'
 import FileEntryPreview from './FileEntry/FileEntryPreview.vue'
 import logger from '../logger.js'
 
-Vue.directive('onClickOutside', vOnClickOutside)
-
-export default Vue.extend({
+export default defineComponent({
 	name: 'FileEntryGrid',
 
 	components: {
@@ -111,14 +110,18 @@ export default Vue.extend({
 		FileEntryPreview,
 	},
 
+	directives: {
+		onClickOutside: vOnClickOutside,
+	},
+
 	inheritAttrs: false,
 	props: {
 		source: {
-			type: [Folder, NcFile, Node] as PropType<Node>,
+			type: [Folder, NcFile, NcNode] as PropType<NcNode>,
 			required: true,
 		},
 		nodes: {
-			type: Array as PropType<Node[]>,
+			type: Array as PropType<NcNode[]>,
 			required: true,
 		},
 		filesListWidth: {
@@ -150,19 +153,19 @@ export default Vue.extend({
 	},
 
 	computed: {
-		currentView(): View {
-			return this.$navigation.active as View
+		currentView() {
+			return (this.$navigation as Navigation).active
 		},
 
-		currentDir() {
+		currentDir(): string {
 			// Remove any trailing slash but leave root slash
 			return (this.$route?.query?.dir?.toString() || '/').replace(/^(.+)\/$/, '$1')
 		},
-		currentFileId() {
+		currentFileId(): number {
 			return this.$route.params?.fileid || this.$route.query?.fileid || null
 		},
 		fileid() {
-			return this.source?.fileid?.toString?.()
+			return this.source?.fileid
 		},
 		uniqueId() {
 			return hashCode(this.source.source)
@@ -193,7 +196,7 @@ export default Vue.extend({
 			return this.selectionStore.selected
 		},
 		isSelected() {
-			return this.selectedFiles.includes(this.fileid)
+			return this.fileid !== undefined && this.selectedFiles.includes(this.fileid)
 		},
 
 		isRenaming() {
@@ -201,17 +204,17 @@ export default Vue.extend({
 		},
 
 		isActive() {
-			return this.fileid === this.currentFileId?.toString?.()
+			return this.fileid === this.currentFileId
 		},
 
 		canDrag() {
-			const canDrag = (node: Node): boolean => {
+			const canDrag = (node: NcNode): boolean => {
 				return (node?.permissions & Permission.UPDATE) !== 0
 			}
 
 			// If we're dragging a selection, we need to check all files
 			if (this.selectedFiles.length > 0) {
-				const nodes = this.selectedFiles.map(fileid => this.filesStore.getNode(fileid)) as Node[]
+				const nodes = this.selectedFiles.map(fileid => this.filesStore.getNode(fileid)) as NcNode[]
 				return nodes.every(canDrag)
 			}
 			return canDrag(this.source)
@@ -223,7 +226,7 @@ export default Vue.extend({
 			}
 
 			// If the current folder is also being dragged, we can't drop it on itself
-			if (this.draggingFiles.includes(this.fileid)) {
+			if (this.fileid === undefined || this.draggingFiles.includes(this.fileid)) {
 				return false
 			}
 
@@ -259,7 +262,7 @@ export default Vue.extend({
 			// Reset loading state
 			this.loading = ''
 
-			this.$refs.preview.reset()
+			this.$refs.preview?.reset?.()
 
 			// Close menu
 			this.openedMenu = false
@@ -282,19 +285,23 @@ export default Vue.extend({
 		},
 
 		execDefaultAction(...args) {
-			this.$refs.actions.execDefaultAction(...args)
+			this.$refs.actions?.execDefaultAction?.(...args)
 		},
 
 		openDetailsIfAvailable(event) {
 			event.preventDefault()
 			event.stopPropagation()
-			if (sidebarAction?.enabled?.([this.source], this.currentView)) {
+			if (this.currentView && sidebarAction?.enabled?.([this.source], this.currentView)) {
 				sidebarAction.exec(this.source, this.currentView, this.currentDir)
 			}
 		},
 
 		onDragOver(event: DragEvent) {
 			this.dragover = this.canDrop
+			if (event.dataTransfer === null) {
+				return
+			}
+
 			if (!this.canDrop) {
 				event.dataTransfer.dropEffect = 'none'
 				return
@@ -333,14 +340,17 @@ export default Vue.extend({
 
 			// Dragging set of files, if we're dragging a file
 			// that is already selected, we use the entire selection
-			if (this.selectedFiles.includes(this.fileid)) {
-				this.draggingStore.set(this.selectedFiles)
-			} else {
-				this.draggingStore.set([this.fileid])
+			if (this.fileid !== undefined) {
+				if (this.selectedFiles.includes(this.fileid)) {
+					this.draggingStore.set(this.selectedFiles)
+				} else {
+					this.draggingStore.set([this.fileid])
+				}
 			}
 
 			const nodes = this.draggingStore.dragging
-				.map(fileid => this.filesStore.getNode(fileid)) as Node[]
+				.map(fileid => this.filesStore.getNode(fileid))
+				.filter((node) => node !== undefined) as NcNode[]
 
 			const image = await getDragAndDropPreview(nodes)
 			event.dataTransfer?.setDragImage(image, -10, -10)
@@ -376,21 +386,23 @@ export default Vue.extend({
 				return
 			}
 
-			const nodes = this.draggingFiles.map(fileid => this.filesStore.getNode(fileid)) as Node[]
-			nodes.forEach(async (node: Node) => {
-				Vue.set(node, 'status', NodeStatus.LOADING)
+			const nodes = this.draggingFiles
+				.map((fileid) => this.filesStore.getNode(fileid))
+				.filter((node) => node !== undefined) as NcNode[]
+			nodes.forEach(async (node: NcNode) => {
+				this.$set(node, 'status', NodeStatus.LOADING)
 				try {
 					// TODO: resolve potential conflicts prior and force overwrite
-					await handleCopyMoveNodeTo(node, this.source, isCopy ? MoveCopyAction.COPY : MoveCopyAction.MOVE)
+					await handleCopyMoveNodeTo(node, this.source as Folder, isCopy ? MoveCopyAction.COPY : MoveCopyAction.MOVE)
 				} catch (error) {
 					logger.error('Error while moving file', { error })
 					if (isCopy) {
-						showError(t('files', 'Could not copy {file}. {message}', { file: node.basename, message: error.message || '' }))
+						showError(t('files', 'Could not copy {file}. {message}', { file: node.basename, message: (error as Error).message || '' }))
 					} else {
-						showError(t('files', 'Could not move {file}. {message}', { file: node.basename, message: error.message || '' }))
+						showError(t('files', 'Could not move {file}. {message}', { file: node.basename, message: (error as Error).message || '' }))
 					}
 				} finally {
-					Vue.set(node, 'status', undefined)
+					this.$set(node, 'status', undefined)
 				}
 			})
 
diff --git a/apps/files/src/components/FilesListTableHeader.vue b/apps/files/src/components/FilesListTableHeader.vue
index fef7c7a213e1c..6353650521a59 100644
--- a/apps/files/src/components/FilesListTableHeader.vue
+++ b/apps/files/src/components/FilesListTableHeader.vue
@@ -76,9 +76,13 @@
 </template>
 
 <script lang="ts">
+import type { Navigation, Node } from '@nextcloud/files'
+import type { PropType } from 'vue'
+
 import { translate } from '@nextcloud/l10n'
+import { defineComponent } from 'vue'
+
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
-import Vue from 'vue'
 
 import { useFilesStore } from '../store/files.ts'
 import { useSelectionStore } from '../store/selection.ts'
@@ -87,7 +91,7 @@ import FilesListTableHeaderButton from './FilesListTableHeaderButton.vue'
 import filesSortingMixin from '../mixins/filesSorting.ts'
 import logger from '../logger.js'
 
-export default Vue.extend({
+export default defineComponent({
 	name: 'FilesListTableHeader',
 
 	components: {
@@ -110,7 +114,7 @@ export default Vue.extend({
 			default: false,
 		},
 		nodes: {
-			type: Array,
+			type: Array as PropType<Node[]>,
 			required: true,
 		},
 		filesListWidth: {
@@ -130,7 +134,7 @@ export default Vue.extend({
 
 	computed: {
 		currentView() {
-			return this.$navigation.active
+			return (this.$navigation as Navigation).active
 		},
 
 		columns() {
@@ -143,7 +147,7 @@ export default Vue.extend({
 
 		dir() {
 			// Remove any trailing slash but leave root slash
-			return (this.$route?.query?.dir || '/').replace(/^(.+)\/$/, '$1')
+			return (this.$route?.query?.dir || '/').replace(/^(.+)\/$/, '$1') as string
 		},
 
 		selectAllBind() {
@@ -188,13 +192,13 @@ export default Vue.extend({
 				'files-list__column': true,
 				'files-list__column--sortable': !!column.sort,
 				'files-list__row-column-custom': true,
-				[`files-list__row-${this.currentView.id}-${column.id}`]: true,
+				[`files-list__row-${this.currentView?.id}-${column.id}`]: true,
 			}
 		},
 
 		onToggleAll(selected) {
 			if (selected) {
-				const selection = this.nodes.map(node => node.fileid.toString())
+				const selection = this.nodes.map(node => node.fileid).filter((id) => id !== undefined) as number[]
 				logger.debug('Added all nodes to selection', { selection })
 				this.selectionStore.setLastIndex(null)
 				this.selectionStore.set(selection)
diff --git a/apps/files/src/components/FilesListTableHeaderActions.vue b/apps/files/src/components/FilesListTableHeaderActions.vue
index 3b364a0b83d4b..2fe4b2a17c2c0 100644
--- a/apps/files/src/components/FilesListTableHeaderActions.vue
+++ b/apps/files/src/components/FilesListTableHeaderActions.vue
@@ -42,14 +42,18 @@
 </template>
 
 <script lang="ts">
+import type { Node as NcNode, View } from '@nextcloud/files'
+import type { PropType } from 'vue'
+
 import { NodeStatus, getFileActions } from '@nextcloud/files'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { translate } from '@nextcloud/l10n'
+import { defineComponent } from 'vue'
+
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcIconSvgWrapper from '@nextcloud/vue/dist/Components/NcIconSvgWrapper.js'
 import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
-import Vue from 'vue'
 
 import { useActionsMenuStore } from '../store/actionsmenu.ts'
 import { useFilesStore } from '../store/files.ts'
@@ -60,7 +64,7 @@ import logger from '../logger.js'
 // The registered actions list
 const actions = getFileActions()
 
-export default Vue.extend({
+export default defineComponent({
 	name: 'FilesListTableHeaderActions',
 
 	components: {
@@ -76,11 +80,11 @@ export default Vue.extend({
 
 	props: {
 		currentView: {
-			type: Object,
+			type: Object as PropType<View>,
 			required: true,
 		},
 		selectedNodes: {
-			type: Array,
+			type: Array as PropType<number[]>,
 			default: () => ([]),
 		},
 	},
@@ -115,13 +119,17 @@ export default Vue.extend({
 		},
 
 		nodes() {
+			// eslint-disable-next-line jsdoc/require-jsdoc
+			function isNode(node: unknown): node is NcNode {
+				return node !== undefined
+			}
 			return this.selectedNodes
-				.map(fileid => this.getNode(fileid))
-				.filter(node => node)
+				.map((fileid) => this.filesStore.getNode(fileid))
+				.filter(isNode)
 		},
 
 		areSomeNodesLoading() {
-			return this.nodes.some(node => node.status === NodeStatus.LOADING)
+			return this.nodes.some((node) => node.status === NodeStatus.LOADING)
 		},
 
 		openedMenu: {
@@ -148,16 +156,6 @@ export default Vue.extend({
 	},
 
 	methods: {
-		/**
-		 * Get a cached note from the store
-		 *
-		 * @param {number} fileId the file id to get
-		 * @return {Folder|File}
-		 */
-		getNode(fileId) {
-			return this.filesStore.getNode(fileId)
-		},
-
 		async onActionClick(action) {
 			const displayName = action.displayName(this.nodes, this.currentView)
 			const selectionIds = this.selectedNodes
@@ -165,7 +163,7 @@ export default Vue.extend({
 				// Set loading markers
 				this.loading = action.id
 				this.nodes.forEach(node => {
-					Vue.set(node, 'status', NodeStatus.LOADING)
+					this.$set(node, 'status', NodeStatus.LOADING)
 				})
 
 				// Dispatch action execution
@@ -199,7 +197,7 @@ export default Vue.extend({
 				// Remove loading markers
 				this.loading = null
 				this.nodes.forEach(node => {
-					Vue.set(node, 'status', undefined)
+					this.$set(node, 'status', undefined)
 				})
 			}
 		},
diff --git a/apps/files/src/store/files.ts b/apps/files/src/store/files.ts
index 56ae01192ef21..d4fa42484fe43 100644
--- a/apps/files/src/store/files.ts
+++ b/apps/files/src/store/files.ts
@@ -29,7 +29,8 @@ import Vue from 'vue'
 
 export const useFilesStore = function(...args) {
 	const store = defineStore('files', {
-		state: (): FilesState => ({
+		state: (): FilesState & { _initialized: boolean } => ({
+			_initialized: false,
 			files: {} as FilesStore,
 			roots: {} as RootsStore,
 		}),
@@ -37,18 +38,21 @@ export const useFilesStore = function(...args) {
 		getters: {
 			/**
 			 * Get a file or folder by id
+			 * @param state the stores state
 			 */
 			getNode: (state) => (id: FileId): Node|undefined => state.files[id],
 
 			/**
 			 * Get a list of files or folders by their IDs
 			 * Does not return undefined values
+			 * @param state the stores state
 			 */
 			getNodes: (state) => (ids: FileId[]): Node[] => ids
 				.map(id => state.files[id])
 				.filter(Boolean),
 			/**
 			 * Get a file or folder by id
+			 * @param state the stores state
 			 */
 			getRoot: (state) => (service: Service): Folder|undefined => state.roots[service],
 		},
@@ -58,7 +62,7 @@ export const useFilesStore = function(...args) {
 				// Update the store all at once
 				const files = nodes.reduce((acc, node) => {
 					if (!node.fileid) {
-						logger.error('Trying to update/set a node without fileid', node)
+						logger.error('Trying to update/set a node without fileid', { node })
 						return acc
 					}
 					acc[node.fileid] = node
diff --git a/apps/files/src/types.ts b/apps/files/src/types.ts
index 778e9ff297159..62fa6ae4226a9 100644
--- a/apps/files/src/types.ts
+++ b/apps/files/src/types.ts
@@ -82,7 +82,7 @@ export interface SelectionStore {
 // Actions menu store
 export type GlobalActions = 'global'
 export interface ActionsMenuStore {
-	opened: GlobalActions|string|null
+	opened: GlobalActions|string|number|null
 }
 
 // View config store
diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue
index 42423e1f45169..27b0dba0b552c 100644
--- a/apps/files/src/views/FilesList.vue
+++ b/apps/files/src/views/FilesList.vue
@@ -103,10 +103,10 @@
 import type { Route } from 'vue-router'
 import type { Upload } from '@nextcloud/upload'
 import type { UserConfig } from '../types.ts'
-import type { View, ContentsWithRoot } from '@nextcloud/files'
+import type { View, ContentsWithRoot, Navigation } from '@nextcloud/files'
 
 import { emit } from '@nextcloud/event-bus'
-import { Folder, Node, Permission } from '@nextcloud/files'
+import { FileType, Folder, Node, Permission } from '@nextcloud/files'
 import { getCapabilities } from '@nextcloud/capabilities'
 import { join, dirname } from 'path'
 import { orderBy } from 'natural-orderby'
@@ -185,7 +185,7 @@ export default defineComponent({
 	data() {
 		return {
 			loading: true,
-			promise: null,
+			promise: null as Promise | null,
 			Type,
 		}
 	},
@@ -196,8 +196,8 @@ export default defineComponent({
 		},
 
 		currentView(): View {
-			return (this.$navigation.active
-				|| this.$navigation.views.find(view => view.id === 'files')) as View
+			return ((this.$navigation as Navigation).active
+				|| (this.$navigation as Navigation).views.find((view) => view.id === 'files')) as View
 		},
 
 		/**
@@ -213,14 +213,20 @@ export default defineComponent({
 		 */
 		currentFolder(): Folder|undefined {
 			if (!this.currentView?.id) {
-				return
+				return undefined
 			}
 
 			if (this.dir === '/') {
 				return this.filesStore.getRoot(this.currentView.id)
 			}
 			const fileId = this.pathsStore.getPath(this.currentView.id, this.dir)
-			return this.filesStore.getNode(fileId)
+			if (fileId !== undefined) {
+				const node = this.filesStore.getNode(fileId)
+				if (node?.type === FileType.Folder) {
+					return node as Folder
+				}
+			}
+			return undefined
 		},
 
 		/**
@@ -486,7 +492,9 @@ export default defineComponent({
 			if (window?.OCA?.Files?.Sidebar?.setActiveTab) {
 				window.OCA.Files.Sidebar.setActiveTab('sharing')
 			}
-			sidebarAction.exec(this.currentFolder, this.currentView, this.currentFolder.path)
+			if (this.currentFolder !== undefined) {
+				sidebarAction.exec(this.currentFolder, this.currentView, this.currentFolder.path)
+			}
 		},
 
 		toggleGridView() {