diff --git a/changelog/unreleased/bugfix-display-path-on-resources b/changelog/unreleased/bugfix-display-path-on-resources
new file mode 100644
index 00000000000..25d2a2bd629
--- /dev/null
+++ b/changelog/unreleased/bugfix-display-path-on-resources
@@ -0,0 +1,7 @@
+Bugfix: Fix display path on resources
+
+We've fixed a bug, where the display path of a resource was missing parts.
+For example the respective space name or the folder name of a share.
+
+https://github.com/owncloud/web/pull/9843
+
diff --git a/changelog/unreleased/enhancement-add-editors-to-application-menu b/changelog/unreleased/enhancement-add-editors-to-application-menu
new file mode 100644
index 00000000000..f54be84b6a8
--- /dev/null
+++ b/changelog/unreleased/enhancement-add-editors-to-application-menu
@@ -0,0 +1,8 @@
+Enhancement: Add editors to the application menu
+
+We've added 'text-editor' and 'draw.io' to the application menu, so the user can easily
+open those apps with a one-click approach.
+
+https://github.com/owncloud/web/pull/9809
+https://github.com/owncloud/web/pull/9843
+https://github.com/owncloud/web/issues/9807
diff --git a/packages/design-system/src/components/OcResource/OcResource.vue b/packages/design-system/src/components/OcResource/OcResource.vue
index 20f1d3929e3..0a3191279a1 100644
--- a/packages/design-system/src/components/OcResource/OcResource.vue
+++ b/packages/design-system/src/components/OcResource/OcResource.vue
@@ -56,6 +56,7 @@
           :full-path="resource.path"
           :is-path-displayed="isPathDisplayed"
           :is-extension-displayed="isExtensionDisplayed"
+          @click="$emit('clickFolder')"
         />
       </oc-resource-link>
       <div class="oc-resource-indicators">
@@ -65,7 +66,7 @@
           :to="parentFolderLink"
           :style="parentFolderStyle"
           class="parent-folder"
-          @click.stop="$emit('parentFolderClicked')"
+          @click="$emit('clickParentFolder')"
         >
           <oc-icon v-bind="parentFolderLinkIconAttrs" />
           <span class="text" v-text="parentFolderName" />
@@ -189,7 +190,7 @@ export default defineComponent({
       default: true
     }
   },
-  emits: ['click', 'parentFolderClicked'],
+  emits: ['click', 'clickFolder', 'clickParentFolder'],
   computed: {
     parentFolderComponentType() {
       return this.parentFolderLink !== null ? 'router-link' : 'span'
@@ -301,6 +302,7 @@ export default defineComponent({
     a {
       text-decoration: none;
     }
+
     a:hover,
     a:focus {
       outline-offset: 0;
@@ -345,94 +347,94 @@ export default defineComponent({
 </style>
 
 <docs>
-  ```js
-    <template>
-      <div>
-        <oc-resource :resource="documents" parent-folder-link="parentFolderLink" class="oc-mb" />
-        <oc-resource :resource="notes" is-path-displayed="true" class="oc-mb" />
-        <oc-resource :resource="notes" is-resource-clickable="false" class="oc-mb" />
-        <oc-resource :resource="notes" :is-extension-displayed="false" class="oc-mb" />
-        <oc-resource :resource="forest" is-path-displayed="true" />
-        <oc-resource :resource="something" is-path-displayed="true" parent-folder-name="Example parent folder"  />
-      </div>
-    </template>
-    <script>
-    export default {
-      computed: {
-        documents() {
-          return {
-            name: "Documents",
-            path: "/Documents",
-            indicators: [],
-            type: "folder",
-            isFolder: true
-          }
-        },
-        notes() {
-          return {
-            name: "notes.txt",
-            extension: "txt",
-            path: "Documents/notes.txt",
-            indicators: this.indicators,
-            type: "file",
-            isFolder: false
-          }
-        },
-        forest() {
-          return {
-            name: "forest-image-with-filename-with-a-lot-of-characters.jpg",
-            extension: "jpg",
-            path: "images/nature/forest-image-with-filename-with-a-lot-of-characters.jpg",
-            thumbnail: "https://picsum.photos/200/300",
-            indicators: [],
-            type: "file",
-            isFolder: false,
-            opensInNewWindow: true,
-          }
-        },
-        something() {
-          return {
-            name: "another-image.jpg",
-            extension: "jpg",
-            path: "another-image.jpg",
-            thumbnail: "https://picsum.photos/200/300",
-            indicators: [],
-            type: "file",
-            isFolder: false,
-            opensInNewWindow: true,
+```js
+<template>
+  <div>
+    <oc-resource :resource="documents" parent-folder-link="parentFolderLink" class="oc-mb"/>
+    <oc-resource :resource="notes" is-path-displayed="true" class="oc-mb"/>
+    <oc-resource :resource="notes" is-resource-clickable="false" class="oc-mb"/>
+    <oc-resource :resource="notes" :is-extension-displayed="false" class="oc-mb"/>
+    <oc-resource :resource="forest" is-path-displayed="true"/>
+    <oc-resource :resource="something" is-path-displayed="true" parent-folder-name="Example parent folder"/>
+  </div>
+</template>
+<script>
+  export default {
+    computed: {
+      documents() {
+        return {
+          name: "Documents",
+          path: "/Documents",
+          indicators: [],
+          type: "folder",
+          isFolder: true
+        }
+      },
+      notes() {
+        return {
+          name: "notes.txt",
+          extension: "txt",
+          path: "Documents/notes.txt",
+          indicators: this.indicators,
+          type: "file",
+          isFolder: false
+        }
+      },
+      forest() {
+        return {
+          name: "forest-image-with-filename-with-a-lot-of-characters.jpg",
+          extension: "jpg",
+          path: "images/nature/forest-image-with-filename-with-a-lot-of-characters.jpg",
+          thumbnail: "https://picsum.photos/200/300",
+          indicators: [],
+          type: "file",
+          isFolder: false,
+          opensInNewWindow: true,
+        }
+      },
+      something() {
+        return {
+          name: "another-image.jpg",
+          extension: "jpg",
+          path: "another-image.jpg",
+          thumbnail: "https://picsum.photos/200/300",
+          indicators: [],
+          type: "file",
+          isFolder: false,
+          opensInNewWindow: true,
+        }
+      },
+      indicators() {
+        return [
+          {
+            id: 'files-sharing',
+            label: "Shared with other people",
+            visible: true,
+            icon: 'group',
+            handler: (resource, indicatorId) => alert(`Resource: ${resource.name}, indicator: ${indicatorId}`)
+          },
+          {
+            id: 'file-link',
+            label: "Shared via link",
+            visible: true,
+            icon: 'link',
           }
-        },
-        indicators() {
-          return [
-            {
-              id: 'files-sharing',
-              label: "Shared with other people",
-              visible: true,
-              icon: 'group',
-              handler: (resource, indicatorId) => alert(`Resource: ${resource.name}, indicator: ${indicatorId}`)
-            },
-            {
-              id: 'file-link',
-              label: "Shared via link",
-              visible: true,
-              icon: 'link',
-            }
-          ]
-        },
-        parentFolderLink() {
-          return {
-            name: "home",
-            params: {
-              action: "copy",
-              item: 'Documents',
-            },
-            query: {
-              resource: "notes"
-            }
+        ]
+      },
+      parentFolderLink() {
+        return {
+          name: "home",
+          params: {
+            action: "copy",
+            item: 'Documents',
+          },
+          query: {
+            resource: "notes"
           }
         }
-      },
-    }
-  </script>
-  ```
+      }
+    },
+  }
+</script>
+```
 </docs>
diff --git a/packages/web-pkg/src/components/Search/ResourcePreview.vue b/packages/web-pkg/src/components/Search/ResourcePreview.vue
index 630aefee931..733c31c8f41 100644
--- a/packages/web-pkg/src/components/Search/ResourcePreview.vue
+++ b/packages/web-pkg/src/components/Search/ResourcePreview.vue
@@ -1,24 +1,18 @@
 <template>
-  <oc-button
-    :type="resource.isFolder ? 'router-link' : 'button'"
-    justify-content="left"
-    class="files-search-preview oc-flex oc-width-1-1"
-    appearance="raw"
-    v-bind="attrs"
-    v-on="listeners"
-  >
-    <oc-resource
-      :resource="resource"
-      :path-prefix="pathPrefix"
-      :is-path-displayed="true"
-      :is-resource-clickable="false"
-      :parent-folder-link="parentFolderLink"
-      :parent-folder-link-icon-additional-attributes="parentFolderLinkIconAdditionalAttributes"
-      :parent-folder-name="parentFolderName"
-      :is-thumbnail-displayed="displayThumbnails"
-      @parent-folder-clicked="parentFolderClicked"
-    />
-  </oc-button>
+  <oc-resource
+    :resource="resource"
+    :path-prefix="pathPrefix"
+    :is-path-displayed="true"
+    :is-resource-clickable="true"
+    :folder-link="folderLink"
+    :parent-folder-link="parentFolderLink"
+    :parent-folder-link-icon-additional-attributes="parentFolderLinkIconAdditionalAttributes"
+    :parent-folder-name="parentFolderName"
+    :is-thumbnail-displayed="displayThumbnails"
+    @click="resourceClicked"
+    @click-folder="folderClicked"
+    @click-parent-folder="folderClicked"
+  />
 </template>
 
 <script lang="ts">
@@ -27,23 +21,16 @@ import { VisibilityObserver } from '../../observer'
 import { debounce } from 'lodash-es'
 import { computed, defineComponent, PropType, ref, unref } from 'vue'
 import { mapGetters } from 'vuex'
-import { createLocationShares, createLocationSpaces } from '../../router'
-import path, { dirname } from 'path'
 import {
   useCapabilityShareJailEnabled,
   useGetMatchingSpace,
   useFileActions,
   useFolderLink
 } from '../../composables'
-import {
-  isProjectSpaceResource,
-  isShareSpaceResource,
-  Resource
-} from '@ownclouders/web-client/src/helpers'
+import { Resource } from '@ownclouders/web-client/src/helpers'
 import { eventBus } from '../../services'
-import { createFileRouteOptions, isResourceTxtFileAlmostEmpty } from '../../helpers'
+import { isResourceTxtFileAlmostEmpty } from '../../helpers'
 import { SearchResultValue } from './types'
-import { useGettext } from 'vue3-gettext'
 
 const visibilityObserver = new VisibilityObserver()
 
@@ -63,10 +50,15 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const { getInternalSpace, getMatchingSpace } = useGetMatchingSpace()
-    const { getPathPrefix, getParentFolderName, getParentFolderLinkIconAdditionalAttributes } =
-      useFolderLink()
-    const { $gettext } = useGettext()
+    const { triggerDefaultAction } = useFileActions()
+    const { getMatchingSpace } = useGetMatchingSpace()
+    const {
+      getPathPrefix,
+      getParentFolderName,
+      getParentFolderLink,
+      getParentFolderLinkIconAdditionalAttributes,
+      getFolderLink
+    } = useFolderLink()
     const previewData = ref()
 
     const resource = computed((): Resource => {
@@ -81,28 +73,32 @@ export default defineComponent({
 
     const space = computed(() => getMatchingSpace(unref(resource)))
 
-    const spaceName = computed(() => {
-      if (isShareSpaceResource(unref(space))) {
-        return path.join($gettext('Shared with me'), unref(space).name)
-      }
-
-      return unref(space).name
-    })
-
     const resourceDisabled = computed(() => {
       return unref(resource).disabled === true
     })
 
+    const resourceClicked = () => {
+      eventBus.publish('app.search.options-drop.hide')
+      triggerDefaultAction({
+        space: unref(space),
+        resources: [unref(resource)]
+      })
+    }
+
+    const folderClicked = () => {
+      eventBus.publish('app.search.options-drop.hide')
+    }
+
     return {
       space,
-      spaceName,
-      ...useFileActions(),
-      getInternalSpace,
-      getMatchingSpace,
       hasShareJail: useCapabilityShareJailEnabled(),
       previewData,
       resource,
       resourceDisabled,
+      resourceClicked,
+      folderClicked,
+      parentFolderLink: getParentFolderLink(unref(resource)),
+      folderLink: getFolderLink(unref(resource)),
       pathPrefix: getPathPrefix(unref(resource)),
       parentFolderName: getParentFolderName(unref(resource)),
       parentFolderLinkIconAdditionalAttributes: getParentFolderLinkIconAdditionalAttributes(
@@ -114,41 +110,11 @@ export default defineComponent({
     ...mapGetters(['configuration']),
     ...mapGetters('runtime/spaces', ['spaces']),
 
-    attrs() {
-      return this.resource.isFolder
-        ? {
-            to: this.createFolderLink(this.resource.path, this.resource.fileId)
-          }
-        : {}
-    },
-    listeners() {
-      return this.resource.isFolder
-        ? {}
-        : {
-            click: () =>
-              this.triggerDefaultAction({
-                space: this.space,
-                resources: [this.resource]
-              })
-          }
-    },
     displayThumbnails() {
       return (
         !this.configuration?.options?.disablePreviews &&
         !isResourceTxtFileAlmostEmpty(this.resource)
       )
-    },
-    folderLink() {
-      return this.createFolderLink(this.resource.path, this.resource.fileId)
-    },
-    parentFolderLink() {
-      if (this.resource.shareId && this.resource.path === '/') {
-        return createLocationShares('files-shares-with-me')
-      }
-      if (isProjectSpaceResource(this.resource)) {
-        return createLocationSpaces('files-spaces-projects')
-      }
-      return this.createFolderLink(dirname(this.resource.path), this.resource.parentFolderId)
     }
   },
   mounted() {
@@ -177,21 +143,6 @@ export default defineComponent({
   },
   beforeUnmount() {
     visibilityObserver.disconnect()
-  },
-  methods: {
-    parentFolderClicked() {
-      eventBus.publish('app.search.options-drop.hide')
-    },
-    createFolderLink(p: string, fileId: string | number) {
-      if (!this.space) {
-        return {}
-      }
-
-      return createLocationSpaces(
-        'files-spaces-generic',
-        createFileRouteOptions(this.space, { path: p, fileId })
-      )
-    }
   }
 })
 </script>
diff --git a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
index 9a329448645..ab2cf8e45c8 100644
--- a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
+++ b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
@@ -28,7 +28,7 @@ export const useFolderLink = (options: ResourceRouteResolverOptions = {}) => {
     }
 
     if (isShareSpaceResource(space)) {
-      return path.join($gettext('Shares'), $gettext('Shared with me'), space.name)
+      return path.join($gettext('Shares'), space.name)
     }
 
     return space.name
diff --git a/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts b/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
index 957c0a177d6..02fe65b3cf5 100644
--- a/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
@@ -18,7 +18,7 @@ jest.mock('../../../../src/composables/spaces/useGetMatchingSpace', () => ({
 describe('Preview component', () => {
   const driveAliasAndItem = '1'
   jest.mocked(useGetMatchingSpace).mockImplementation(() => useGetMatchingSpaceMock())
-  it('should set correct props on oc-resource component', () => {
+  it('should render preview component', () => {
     const { wrapper } = getWrapper({
       space: mock<SpaceResource>({
         id: '1',
@@ -27,23 +27,7 @@ describe('Preview component', () => {
         getDriveAliasAndItem: () => driveAliasAndItem
       })
     })
-    const ocResource = wrapper.findComponent<any>('oc-resource-stub')
-
-    expect(ocResource.props().resource).toMatchObject(wrapper.vm.searchResult.data)
-  })
-  describe('computed parentFolderLink', () => {
-    it('should use the items storageId for the resource target location if present', () => {
-      const driveAliasAndItem = '1'
-      const { wrapper } = getWrapper({
-        space: mock<SpaceResource>({
-          id: '1',
-          driveType: 'project',
-          name: 'New space',
-          getDriveAliasAndItem: () => driveAliasAndItem
-        })
-      })
-      expect(wrapper.vm.parentFolderLink.params.driveAliasAndItem).toEqual(driveAliasAndItem)
-    })
+    expect(wrapper.html()).toMatchSnapshot()
   })
 })
 
@@ -73,6 +57,9 @@ function getWrapper({
 } = {}) {
   jest.mocked(useGetMatchingSpace).mockImplementation(() =>
     useGetMatchingSpaceMock({
+      isResourceAccessible() {
+        return true
+      },
       getMatchingSpace() {
         return space
       }
@@ -90,7 +77,8 @@ function getWrapper({
       }),
       capabilities: () => ({
         spaces: {
-          share_jail: hasShareJail
+          share_jail: hasShareJail,
+          projects: { enabled: true }
         }
       }),
       user: () => user
diff --git a/packages/web-pkg/tests/unit/components/Search/__snapshots__/ResourcePreview.spec.ts.snap b/packages/web-pkg/tests/unit/components/Search/__snapshots__/ResourcePreview.spec.ts.snap
new file mode 100644
index 00000000000..5598ec4e6e1
--- /dev/null
+++ b/packages/web-pkg/tests/unit/components/Search/__snapshots__/ResourcePreview.spec.ts.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Preview component should render preview component 1`] = `<oc-resource-stub folderlink="[object Object]" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlink="[object Object]" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="New space" pathprefix="Spaces/New space" resource="[object Object]"></oc-resource-stub>`;
diff --git a/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap b/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
index dbf7655debc..e1f85b08fd4 100644
--- a/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
+++ b/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
@@ -5,7 +5,7 @@ exports[`AppTopBar if a resource is present renders a resource and dropdownActio
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/Shared with me/test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->
@@ -23,7 +23,7 @@ exports[`AppTopBar if a resource is present renders a resource and dropdownActio
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/Shared with me/test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <context-action-menu-stub actionoptions="[object Object]" appearance="raw-inverse" menusections="[object Object]" variation="brand"></context-action-menu-stub>
@@ -41,7 +41,7 @@ exports[`AppTopBar if a resource is present renders a resource and mainActions (
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/Shared with me/test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <context-action-menu-stub actionoptions="[object Object]" appearance="raw-inverse" menusections="[object Object]" variation="brand"></context-action-menu-stub>
@@ -58,7 +58,7 @@ exports[`AppTopBar if a resource is present renders a resource and no actions (i
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/Shared with me/test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->
@@ -75,7 +75,7 @@ exports[`AppTopBar if no resource is present renders only a close button 1`] = `
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/Shared with me/test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->