diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
index daf683ad9c..c24b6e7069 100644
--- a/packages/web-app-files/src/views/spaces/Projects.vue
+++ b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -107,8 +107,9 @@
                 <oc-icon name="group" fill-type="line" />
               </oc-button>
             </template>
-            <template #contextMenu="{ resource }">
+            <template #contextMenu="{ resource, isOpen }">
               <space-context-actions
+                v-if="isOpen && isResourceInSelection(resource)"
                 :loading="resource.graphPermissions === undefined"
                 :action-options="{ resources: [resource] as SpaceResource[] }"
               />
@@ -223,7 +224,8 @@ const {
   scrollToResourceFromRoute,
   areResourcesLoading,
   selectedResourcesIds,
-  selectedResources
+  selectedResources,
+  isResourceInSelection
 } = useResourcesViewDefaults({ loadResourcesTask })
 
 let loadPreviewToken: string = null
diff --git a/packages/web-pkg/src/components/AppTopBar.vue b/packages/web-pkg/src/components/AppTopBar.vue
index d3d2c6915f..d2c4f2b047 100644
--- a/packages/web-pkg/src/components/AppTopBar.vue
+++ b/packages/web-pkg/src/components/AppTopBar.vue
@@ -94,7 +94,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, unref } from 'vue'
-import ContextActionMenu, { MenuSection } from './ContextActions/ContextActionMenu.vue'
+import ContextActionMenu from './ContextActions/ContextActionMenu.vue'
 import { useGettext } from 'vue3-gettext'
 import {
   Action,
@@ -107,6 +107,7 @@ import {
 import ResourceListItem from './FilesList/ResourceListItem.vue'
 import { isPublicSpaceResource, Resource } from '@opencloud-eu/web-client'
 import { Duration } from 'luxon'
+import { MenuSection } from './ContextActions'
 
 export default defineComponent({
   name: 'AppTopBar',
@@ -218,12 +219,14 @@ export default defineComponent({
 
 .app-topbar-action {
   color: var(--oc-role-on-chrome) !important;
+
   svg {
     fill: var(--oc-role-on-chrome) !important;
   }
 
   &:hover:not(:disabled) {
     color: var(--oc-role-on-surface) !important;
+
     svg {
       fill: var(--oc-role-on-surface) !important;
     }
diff --git a/packages/web-pkg/src/components/ContextActions/ActionMenuDropItem.vue b/packages/web-pkg/src/components/ContextActions/ActionMenuDropItem.vue
index 2244e0673d..7f4a850ce3 100644
--- a/packages/web-pkg/src/components/ContextActions/ActionMenuDropItem.vue
+++ b/packages/web-pkg/src/components/ContextActions/ActionMenuDropItem.vue
@@ -40,7 +40,7 @@
 import ActionMenuItem from './ActionMenuItem.vue'
 import { AppearanceType, uniqueId } from '@opencloud-eu/design-system/helpers'
 import type { ActionOptions } from '../../composables'
-import type { MenuSectionDrop } from './ContextActionMenu.vue'
+import { MenuSectionDrop } from './types'
 
 const { menuSectionDrop, appearance, actionOptions } = defineProps<{
   menuSectionDrop: MenuSectionDrop
diff --git a/packages/web-pkg/src/components/ContextActions/ContextActionMenu.vue b/packages/web-pkg/src/components/ContextActions/ContextActionMenu.vue
index cf37c8dd4a..e086af2c43 100644
--- a/packages/web-pkg/src/components/ContextActions/ContextActionMenu.vue
+++ b/packages/web-pkg/src/components/ContextActions/ContextActionMenu.vue
@@ -33,23 +33,10 @@
 <script lang="ts">
 import { defineComponent, PropType } from 'vue'
 import ActionMenuItem from './ActionMenuItem.vue'
-import { Action, ActionOptions } from '../../composables'
+import { ActionOptions } from '../../composables'
 import { AppearanceType } from '@opencloud-eu/design-system/helpers'
 import ActionMenuDropItem from './ActionMenuDropItem.vue'
-
-export type MenuSectionDrop = {
-  label: string
-  name: string
-  icon: string
-  items?: Action[]
-  emptyMessage?: string
-}
-
-export type MenuSection = {
-  name: string
-  items?: Action[]
-  dropItems?: MenuSectionDrop[]
-}
+import { MenuSection } from './types'
 
 export default defineComponent({
   name: 'ContextActionMenu',
diff --git a/packages/web-pkg/src/components/ContextActions/index.ts b/packages/web-pkg/src/components/ContextActions/index.ts
index 2d347d441c..0e6c646865 100644
--- a/packages/web-pkg/src/components/ContextActions/index.ts
+++ b/packages/web-pkg/src/components/ContextActions/index.ts
@@ -2,3 +2,4 @@ export { default as ActionMenuItem } from './ActionMenuItem.vue'
 export { default as ContextActionMenu } from './ContextActionMenu.vue'
 export { default as ContextMenuQuickAction } from './ContextMenuQuickAction.vue'
 export { default as ActionMenuDropItem } from './ActionMenuDropItem.vue'
+export * from './types'
diff --git a/packages/web-pkg/src/components/ContextActions/types.ts b/packages/web-pkg/src/components/ContextActions/types.ts
new file mode 100644
index 0000000000..56fa43ed28
--- /dev/null
+++ b/packages/web-pkg/src/components/ContextActions/types.ts
@@ -0,0 +1,15 @@
+import { Action } from '../../composables'
+
+export type MenuSectionDrop = {
+  label: string
+  name: string
+  icon: string
+  items?: Action[]
+  emptyMessage?: string
+}
+
+export type MenuSection = {
+  name: string
+  items?: Action[]
+  dropItems?: MenuSectionDrop[]
+}
diff --git a/packages/web-pkg/src/components/FilesList/ContextActions.vue b/packages/web-pkg/src/components/FilesList/ContextActions.vue
index 36e1822027..9ca9562121 100644
--- a/packages/web-pkg/src/components/FilesList/ContextActions.vue
+++ b/packages/web-pkg/src/components/FilesList/ContextActions.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import ContextActionMenu, { MenuSection } from '../ContextActions/ContextActionMenu.vue'
+import ContextActionMenu from '../ContextActions/ContextActionMenu.vue'
 import { computed, defineComponent, PropType, Ref, toRef, unref } from 'vue'
 import {
   ActionExtension,
@@ -32,6 +32,7 @@ import {
 } from '../../composables'
 import { isNil } from 'lodash-es'
 import { useGettext } from 'vue3-gettext'
+import { MenuSection } from '../ContextActions'
 
 export default defineComponent({
   name: 'ContextActions',
diff --git a/packages/web-pkg/tests/unit/components/ContextActions/ActionMenuDropItem.spec.ts b/packages/web-pkg/tests/unit/components/ContextActions/ActionMenuDropItem.spec.ts
index 20a1c3bc0f..04198ccad3 100644
--- a/packages/web-pkg/tests/unit/components/ContextActions/ActionMenuDropItem.spec.ts
+++ b/packages/web-pkg/tests/unit/components/ContextActions/ActionMenuDropItem.spec.ts
@@ -1,7 +1,7 @@
 import ActionMenuDropItem from '../../../../src/components/ContextActions/ActionMenuDropItem.vue'
 import { Action } from '../../../../src/composables/actions'
 import { defaultPlugins, mount } from '@opencloud-eu/web-test-helpers'
-import { MenuSectionDrop } from '../../../../src/components/ContextActions/ContextActionMenu.vue'
+import { MenuSectionDrop } from '../../../../src/components/ContextActions'
 
 describe('ActionMenuDropItem component', () => {
   it('renders drop menu with actions', () => {