diff --git a/apps/files/src/components/FilesSidebar/FilesSidebarTab.vue b/apps/files/src/components/FilesSidebar/FilesSidebarTab.vue
index 578654492838a..224e802efbe33 100644
--- a/apps/files/src/components/FilesSidebar/FilesSidebarTab.vue
+++ b/apps/files/src/components/FilesSidebar/FilesSidebarTab.vue
@@ -4,13 +4,12 @@
 -->
 
 <script setup lang="ts">
-import type { ISidebarTab } from '@nextcloud/files'
+import type { ISidebarContext, ISidebarTab } from '@nextcloud/files'
 
 import { NcIconSvgWrapper, NcLoadingIcon } from '@nextcloud/vue'
-import { ref, toRef, watch } from 'vue'
+import { computed, ref, toRef, watch } from 'vue'
 import NcAppSidebarTab from '@nextcloud/vue/components/NcAppSidebarTab'
 import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
-import { useActiveStore } from '../../store/active.ts'
 import { useSidebarStore } from '../../store/sidebar.ts'
 import { logger } from '../../utils/logger.ts'
 
@@ -27,7 +26,17 @@ const props = defineProps<{
 }>()
 
 const sidebar = useSidebarStore()
-const activeStore = useActiveStore()
+
+const context = computed(() => {
+	if (!sidebar.currentContext) {
+		return undefined
+	}
+	return {
+		folder: sidebar.currentContext.folder.clone(),
+		node: sidebar.currentContext.node.clone(),
+		view: sidebar.currentContext.view,
+	}
+})
 
 const loading = ref(true)
 watch(toRef(props, 'active'), async (active) => {
@@ -65,7 +74,7 @@ const initializedTabs = new Set<string>()
 		<template #icon>
 			<NcIconSvgWrapper :svg="tab.iconSvgInline" />
 		</template>
-		<NcEmptyContent v-if="loading">
+		<NcEmptyContent v-if="loading || !context">
 			<template #icon>
 				<NcLoadingIcon />
 			</template>
@@ -75,8 +84,8 @@ const initializedTabs = new Set<string>()
 			:is="tab.tagName"
 			v-else
 			:active.prop="active"
-			:node.prop="sidebar.currentNode"
-			:folder.prop="activeStore.activeFolder"
-			:view.prop="activeStore.activeView" />
+			:node.prop="context.node"
+			:folder.prop="context.folder"
+			:view.prop="context.view" />
 	</NcAppSidebarTab>
 </template>
diff --git a/apps/files/src/store/files.ts b/apps/files/src/store/files.ts
index 90dffe19a21cf..6ea456fb6bdb0 100644
--- a/apps/files/src/store/files.ts
+++ b/apps/files/src/store/files.ts
@@ -11,6 +11,7 @@ import { defineStore } from 'pinia'
 import Vue, { ref } from 'vue'
 import { fetchNode } from '../services/WebdavClient.ts'
 import { logger } from '../utils/logger.ts'
+import { useActiveStore } from './active.ts'
 import { usePathsStore } from './paths.ts'
 
 /**
@@ -124,6 +125,12 @@ export const useFilesStore = defineStore('files', () => {
 		}, {} as FilesStore)
 
 		files.value = { ...files.value, ...newNodes }
+
+		// handle updating the active node
+		const activeStore = useActiveStore()
+		if (activeStore.activeNode && activeStore.activeNode.source in newNodes) {
+			activeStore.activeNode = files.value[activeStore.activeNode.source]
+		}
 	}
 
 	/**
@@ -232,7 +239,8 @@ export const useFilesStore = defineStore('files', () => {
 		}
 
 		// Otherwise, it means we receive an event for a node that is not in the store
-		fetchNode(node.path).then((n) => updateNodes([n]))
+		const newNode = await fetchNode(node.path)
+		updateNodes([newNode])
 	}
 
 	/**
diff --git a/apps/files_versions/src/views/FilesVersionsSidebarTab.vue b/apps/files_versions/src/views/FilesVersionsSidebarTab.vue
index 1337dbc1b9396..d8240c1393d37 100644
--- a/apps/files_versions/src/views/FilesVersionsSidebarTab.vue
+++ b/apps/files_versions/src/views/FilesVersionsSidebarTab.vue
@@ -48,7 +48,8 @@ import { showError, showSuccess } from '@nextcloud/dialogs'
 import { emit } from '@nextcloud/event-bus'
 import { t } from '@nextcloud/l10n'
 import { useIsMobile } from '@nextcloud/vue/composables/useIsMobile'
-import { computed, ref, toRef, watch } from 'vue'
+import { watchDebounced } from '@vueuse/core'
+import { computed, ref } from 'vue'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
 import VersionEntry from '../components/VersionEntry.vue'
 import VersionLabelDialog from '../components/VersionLabelDialog.vue'
@@ -72,19 +73,6 @@ const loading = ref(false)
 const showVersionLabelForm = ref(false)
 const editedVersion = ref<Version | null>(null)
 
-watch(toRef(() => props.node), async () => {
-	if (!props.node) {
-		return
-	}
-
-	try {
-		loading.value = true
-		versions.value = await fetchVersions(props.node)
-	} finally {
-		loading.value = false
-	}
-}, { immediate: true })
-
 const currentVersionMtime = computed(() => props.node?.mtime?.getTime() ?? 0)
 
 /**
@@ -139,6 +127,16 @@ const canCompare = computed(() => {
 		&& window.OCA.Viewer?.mimetypesCompare?.includes(props.node?.mime)
 })
 
+// when either the current node to show or its mtime changes we need to refetch the versions
+watchDebounced([() => props.node.id, currentVersionMtime], async () => {
+	try {
+		loading.value = true
+		versions.value = await fetchVersions(props.node)
+	} finally {
+		loading.value = false
+	}
+}, { immediate: true, debounce: 600 })
+
 /**
  * Handle restored event from Version.vue
  *