diff --git a/changelog/unreleased/bugfix-appbar-viewoptions-alignement b/changelog/unreleased/bugfix-appbar-viewoptions-alignment
similarity index 86%
rename from changelog/unreleased/bugfix-appbar-viewoptions-alignement
rename to changelog/unreleased/bugfix-appbar-viewoptions-alignment
index 5603f5e588f..5e41e78d5c8 100644
--- a/changelog/unreleased/bugfix-appbar-viewoptions-alignement
+++ b/changelog/unreleased/bugfix-appbar-viewoptions-alignment
@@ -1,4 +1,4 @@
-Bugfix: AppBar ViewOptions alignement
+Bugfix: AppBar ViewOptions alignment
 
 We have fixed a visual glitch that rendered the ViewOptions in the AppBar on the left side instead of right-aligned if no Breadcrumbs or SharesNavigation is present.
 
diff --git a/packages/web-app-files/src/views/Personal.vue b/packages/web-app-files/src/views/Personal.vue
index fbc20829349..5676d146982 100644
--- a/packages/web-app-files/src/views/Personal.vue
+++ b/packages/web-app-files/src/views/Personal.vue
@@ -105,6 +105,7 @@ import { useResourcesViewDefaults } from '../composables'
 import { fetchResources } from '../services/folder/loaderPersonal'
 import { defineComponent } from '@vue/composition-api'
 import { Resource } from '../helpers/resource'
+import { useCapabilitySpacesEnabled } from 'web-pkg/src/composables'
 
 const visibilityObserver = new VisibilityObserver()
 
@@ -133,7 +134,8 @@ export default defineComponent({
   setup() {
     return {
       ...useResourcesViewDefaults<Resource, any, any[]>(),
-      resourceTargetLocation: createLocationSpaces('files-spaces-personal-home')
+      resourceTargetLocation: createLocationSpaces('files-spaces-personal-home'),
+      hasSpaces: useCapabilitySpacesEnabled()
     }
   },
 
diff --git a/packages/web-app-files/src/views/PublicFiles.vue b/packages/web-app-files/src/views/PublicFiles.vue
index e9530a3134d..4606d922316 100644
--- a/packages/web-app-files/src/views/PublicFiles.vue
+++ b/packages/web-app-files/src/views/PublicFiles.vue
@@ -1,6 +1,10 @@
 <template>
   <div>
-    <app-bar :has-bulk-actions="true" :breadcrumbs="breadcrumbs">
+    <app-bar
+      :has-bulk-actions="true"
+      :breadcrumbs="breadcrumbs"
+      :breadcrumbs-context-actions-items="[currentFolder]"
+    >
       <template #actions>
         <create-and-upload />
       </template>
@@ -82,7 +86,7 @@ import ListInfo from '../components/FilesList/ListInfo.vue'
 import Pagination from '../components/FilesList/Pagination.vue'
 import ContextActions from '../components/FilesList/ContextActions.vue'
 import { createLocationOperations } from '../router'
-import { breadcrumbsFromPath } from '../helpers/breadcrumbs'
+import { breadcrumbsFromPath, concatBreadcrumbs } from '../helpers/breadcrumbs'
 
 const visibilityObserver = new VisibilityObserver()
 
@@ -126,8 +130,13 @@ export default {
     },
 
     breadcrumbs() {
-      const publicFilesBreadcrumb = breadcrumbsFromPath(this.$route.path, this.$route.params.item)
-      return [{ text: this.$gettext('Public link') }, publicFilesBreadcrumb.splice()]
+      const breadcrumbs = breadcrumbsFromPath(this.$route.path, this.$route.params.item)
+      const rootRoute = breadcrumbs.shift()
+
+      return concatBreadcrumbs(
+        { text: this.$gettext('Public link'), to: rootRoute.to },
+        ...breadcrumbs
+      )
     },
 
     isEmpty() {
diff --git a/packages/web-app-files/tests/unit/views/views.shared.ts b/packages/web-app-files/tests/unit/views/views.shared.ts
index b8138686675..6499d4ff3ef 100644
--- a/packages/web-app-files/tests/unit/views/views.shared.ts
+++ b/packages/web-app-files/tests/unit/views/views.shared.ts
@@ -73,6 +73,7 @@ export const accentuatesTableRowTest = async <V extends Vue>(
       store,
       stubs: stubs,
       computed: {
+        breadcrumbs: () => [],
         displayThumbnails: () => false,
         folderNotFound: () => false,
         isEmpty: () => false