diff --git a/changelog/unreleased/enhancement-add-whitespace-context-menu b/changelog/unreleased/enhancement-add-whitespace-context-menu
new file mode 100644
index 00000000000..b5c804f86c4
--- /dev/null
+++ b/changelog/unreleased/enhancement-add-whitespace-context-menu
@@ -0,0 +1,6 @@
+Enhancement: Add whitespace context-menu
+
+We've added a generic context-menu for right clicking on whitespace.
+
+https://github.com/owncloud/web/pull/8921
+https://github.com/owncloud/web/issues/5861
diff --git a/packages/design-system/src/components/OcTable/OcTable.vue b/packages/design-system/src/components/OcTable/OcTable.vue
index 4aa6ae90223..62ada3daf71 100644
--- a/packages/design-system/src/components/OcTable/OcTable.vue
+++ b/packages/design-system/src/components/OcTable/OcTable.vue
@@ -35,7 +35,7 @@
         </oc-th>
       </oc-tr>
     </oc-thead>
-    <oc-tbody>
+    <oc-tbody class="has-item-context-menu">
       <oc-tr
         v-for="(item, trIndex) in data"
         :key="`oc-tbody-tr-${itemDomSelector(item) || trIndex}`"
diff --git a/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap
index cf25ad4c56d..900246c0c52 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap
@@ -97,7 +97,7 @@ exports[`SpacesList should render all spaces in a table 1`] = `
         </th>
       </tr>
     </thead>
-    <tbody>
+    <tbody class="has-item-context-menu">
       <tr class="oc-tbody-tr oc-tbody-tr-1" data-item-id="1" draggable="false" tabindex="-1">
         <td class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-shrink oc-td oc-table-data-cell oc-table-data-cell-select oc-pl-s">
           <oc-checkbox-stub class="oc-ml-s" disabled="false" hidelabel="true" id="oc-checkbox-2" label="Select 1 Some space" modelvalue="false" option="[object Object]" outline="false" size="large"></oc-checkbox-stub>
diff --git a/packages/web-app-files/src/components/FilesList/ResourceTiles.vue b/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
index e00129e2e75..90f69aefd6f 100644
--- a/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
+++ b/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
@@ -35,7 +35,7 @@
       </oc-drop>
     </div>
     <oc-list class="oc-tiles oc-flex" :class="resizable ? 'resizableTiles' : ''">
-      <li v-for="resource in data" :key="resource.id" class="oc-tiles-item">
+      <li v-for="resource in data" :key="resource.id" class="oc-tiles-item has-item-context-menu">
         <oc-tile
           :ref="(el) => (tileRefs.tiles[resource.id] = el)"
           :resource="resource"
diff --git a/packages/web-app-files/src/components/Spaces/WhitespaceContextMenu.vue b/packages/web-app-files/src/components/Spaces/WhitespaceContextMenu.vue
new file mode 100644
index 00000000000..1f9dda7f1db
--- /dev/null
+++ b/packages/web-app-files/src/components/Spaces/WhitespaceContextMenu.vue
@@ -0,0 +1,100 @@
+<template>
+  <oc-button id="context-menu-trigger-whitespace" appearance="raw">
+    <oc-drop
+      drop-id="context-menu-drop-whitespace"
+      toggle="#context-menu-trigger-whitespace"
+      position="bottom-end"
+      mode="click"
+      class="whitespace-context-actions-list"
+      close-on-click
+      padding-size="small"
+    >
+      <oc-list>
+        <action-menu-item
+          v-for="(action, actionIndex) in menuItemsActions"
+          :key="`section-${action.name}-action-${actionIndex}`"
+          :action="action"
+          :action-options="actionOptions"
+          class="oc-px-s oc-rounded oc-menu-item-hover"
+          :data-testid="`whitespace-context-menu-item-${action.name}`"
+        />
+      </oc-list>
+    </oc-drop>
+  </oc-button>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, PropType, unref } from 'vue'
+import { useGettext } from 'vue3-gettext'
+import { useFileActionsPaste, useFileActionsShowDetails } from 'web-app-files/src/composables'
+import { useFileActionsCreateNewFolder } from 'web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder'
+import { SpaceResource } from 'web-client/src'
+import { useStore } from 'web-pkg/src'
+import ActionMenuItem from 'web-pkg/src/components/ContextActions/ActionMenuItem.vue'
+
+export default defineComponent({
+  name: 'WhitespaceContextMenu',
+  components: { ActionMenuItem },
+  props: {
+    space: {
+      type: Object as PropType<SpaceResource>,
+      required: false,
+      default: null
+    }
+  },
+  setup(props) {
+    const { $gettext } = useGettext()
+    const store = useStore()
+    const contextMenuLabel = computed(() => $gettext('Show context menu'))
+    const currentFolder = computed(() => store.getters['Files/currentFolder'])
+    const actionOptions = computed(() => ({
+      space: props.space,
+      resources: [currentFolder.value]
+    }))
+    const { actions: createNewFolderAction } = useFileActionsCreateNewFolder({
+      store,
+      space: props.space
+    })
+    const { actions: showDetailsAction } = useFileActionsShowDetails({ store })
+    const { actions: pasteAction } = useFileActionsPaste({ store })
+
+    const menuItemsActions = computed(() => {
+      return [
+        ...unref(createNewFolderAction),
+        ...unref(pasteAction),
+        ...unref(showDetailsAction)
+      ].filter((item) => item.isEnabled(unref(actionOptions)))
+    })
+
+    return { contextMenuLabel, actionOptions, currentFolder, menuItemsActions }
+  }
+})
+</script>
+
+<style lang="scss">
+#context-menu-trigger-whitespace {
+  visibility: hidden;
+  width: 0;
+  height: 0;
+}
+.whitespace-context-actions-list {
+  .oc-card {
+    padding-left: 0px !important;
+    padding-right: 0px !important;
+  }
+  text-align: left;
+  white-space: normal;
+
+  a,
+  button,
+  span {
+    display: inline-flex;
+    font-weight: normal !important;
+    gap: 10px;
+    justify-content: flex-start;
+    vertical-align: top;
+    width: 100%;
+    text-align: left;
+  }
+}
+</style>
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index a431a0bdcfc..4a313abcc51 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -218,8 +218,8 @@ export const useFileActionsCreateNewFile = ({
         icon: 'add',
         handler: (args) => handler(args, newFileHandler.ext, openAction),
         label: () => newFileHandler.menuTitle($gettext),
-        isEnabled: ({ resources }) => {
-          return true
+        isEnabled: () => {
+          return unref(currentFolder)?.canUpload({ user: store.getters.user })
         },
         canBeDefault: true,
         componentType: 'button',
@@ -234,8 +234,8 @@ export const useFileActionsCreateNewFile = ({
         icon: 'add',
         handler: (args) => handler(args, mimeType.ext, openAction),
         label: () => mimeType.name,
-        isEnabled: ({ resources }) => {
-          return true
+        isEnabled: () => {
+          return unref(currentFolder)?.canUpload({ user: store.getters.user })
         },
         canBeDefault: true,
         componentType: 'button',
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index 792f948ba42..ae161a42360 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -115,13 +115,13 @@ export const useFileActionsCreateNewFolder = ({
     return [
       {
         name: 'create-folder',
-        icon: 'add',
+        icon: 'folder',
         handler,
         label: () => {
-          return $gettext('Create new Folder')
+          return $gettext('New Folder')
         },
-        isEnabled: ({ resources }) => {
-          return true
+        isEnabled: () => {
+          return unref(currentFolder)?.canCreate()
         },
         canBeDefault: true,
         componentType: 'button',
diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
index 8aa4db9b489..c1ae6a76651 100644
--- a/packages/web-app-files/src/views/spaces/GenericSpace.vue
+++ b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="oc-flex oc-width-1-1" :class="{ 'space-frontpage': isSpaceFrontpage }">
+    <whitespace-context-menu ref="whitespaceContextMenu" :space="space" />
     <keyboard-actions :paginated-resources="paginatedResources" :space="space" />
     <files-view-wrapper>
       <app-bar
@@ -128,7 +129,7 @@
 <script lang="ts">
 import { debounce, omit, last } from 'lodash-es'
 import { basename } from 'path'
-import { computed, defineComponent, PropType, onBeforeUnmount, onMounted, unref } from 'vue'
+import { computed, defineComponent, PropType, onBeforeUnmount, onMounted, unref, ref } from 'vue'
 import { RouteLocationNamedRaw } from 'vue-router'
 import { mapGetters, mapState, mapActions, mapMutations, useStore } from 'vuex'
 import { useGettext } from 'vue3-gettext'
@@ -158,6 +159,7 @@ import SideBar from '../../components/SideBar/SideBar.vue'
 import SpaceHeader from '../../components/Spaces/SpaceHeader.vue'
 import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
 import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
+import WhitespaceContextMenu from 'web-app-files/src/components/Spaces/WhitespaceContextMenu.vue'
 import { useRoute } from 'web-pkg/src/composables'
 import { useDocumentTitle } from 'web-pkg/src/composables/appDefaults/useDocumentTitle'
 import { ImageType } from 'web-pkg/src/constants'
@@ -171,6 +173,7 @@ import { ResourceTransfer, TransferType } from '../../helpers/resource'
 import { FolderLoaderOptions } from '../../services/folder'
 import { CreateTargetRouteOptions } from 'web-app-files/src/helpers/folderLink/types'
 import { BreadcrumbItem } from 'design-system/src/components/OcBreadcrumb/types'
+import { displayPositionedDropdown } from 'web-pkg/src'
 
 const visibilityObserver = new VisibilityObserver()
 
@@ -192,7 +195,8 @@ export default defineComponent({
     ResourceTable,
     ResourceTiles,
     SideBar,
-    SpaceHeader
+    SpaceHeader,
+    WhitespaceContextMenu
   },
   props: {
     space: {
@@ -393,6 +397,16 @@ export default defineComponent({
           performLoaderTask(true, path, fileId)
         }
       )
+      const filesViewWrapper = document.getElementsByClassName('files-view-wrapper')[0]
+      filesViewWrapper?.addEventListener('contextmenu', (event) => {
+        const { target } = event
+        if ((target as HTMLElement).closest('.has-item-context-menu')) {
+          return
+        }
+        event.preventDefault()
+        const newEvent = new MouseEvent('contextmenu', event)
+        showContextMenu(newEvent)
+      })
     })
 
     onBeforeUnmount(() => {
@@ -400,6 +414,16 @@ export default defineComponent({
       eventBus.unsubscribe('app.files.list.load', loadResourcesEventToken)
     })
 
+    const whitespaceContextMenu = ref(null)
+    const showContextMenu = (event) => {
+      store.commit('Files/RESET_SELECTION')
+      displayPositionedDropdown(
+        unref(whitespaceContextMenu).$el._tippy,
+        event,
+        unref(whitespaceContextMenu)
+      )
+    }
+
     return {
       ...useFileActions(),
       ...resourcesViewDefaults,
@@ -412,7 +436,8 @@ export default defineComponent({
       viewModes,
       uploadHint: $gettext(
         'Drag files and folders here or use the "New" or "Upload" buttons to add files'
-      )
+      ),
+      whitespaceContextMenu
     }
   },
 
diff --git a/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap b/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap
index e06fae7e3c2..1a7026cbfe1 100644
--- a/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap
@@ -13,10 +13,10 @@ exports[`ResourceTiles component renders an array of spaces correctly 1`] = `
 <div>
   <!--v-if-->
   <oc-list class="oc-tiles oc-flex">
-    <li class="oc-tiles-item">
+    <li class="oc-tiles-item has-item-context-menu">
       <oc-tile draggable="false" is-resource-selected="false" resource="[object Object]" resource-icon-size="xlarge" resource-route="[object Object]"></oc-tile>
     </li>
-    <li class="oc-tiles-item">
+    <li class="oc-tiles-item has-item-context-menu">
       <oc-tile draggable="false" is-resource-selected="false" resource="[object Object]" resource-icon-size="xlarge" resource-route="[object Object]"></oc-tile>
     </li>
   </oc-list>
diff --git a/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts b/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts
index c5f061cbbe1..fd3ed366b98 100644
--- a/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts
+++ b/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts
@@ -131,6 +131,15 @@ describe('GenericSpace view', () => {
       expect(wrapper.find('.file-empty-upload-hint').exists()).toBeFalsy()
     })
   })
+  describe('whitespace context menu', () => {
+    it('shows whitespace context menu on right click in whitespace', async () => {
+      const { wrapper } = getMountedWrapper()
+      await wrapper.vm.loadResourcesTask.last
+      await wrapper.find('#files-view').trigger('contextmenu')
+      await wrapper.vm.$nextTick()
+      expect(wrapper.vm.whitespaceContextMenu).toBeDefined()
+    })
+  })
 })
 
 function getMountedWrapper({
diff --git a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.ts.snap b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.ts.snap
index f2032ad86b2..9a9b3f9c899 100644
--- a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.ts.snap
@@ -68,10 +68,10 @@ exports[`Projects view different files view states lists all available project s
             </div>
           </div>
           <ul class="oc-list oc-my-rm oc-mx-rm oc-tiles oc-flex resizableTiles">
-            <li class="oc-tiles-item">
+            <li class="oc-tiles-item has-item-context-menu">
               <oc-tile-stub draggable="false" is-resource-selected="false" resource="[object Object]" resource-icon-size="xlarge" resource-route="[object Object]"></oc-tile-stub>
             </li>
-            <li class="oc-tiles-item">
+            <li class="oc-tiles-item has-item-context-menu">
               <oc-tile-stub draggable="false" is-resource-selected="false" resource="[object Object]" resource-icon-size="xlarge" resource-route="[object Object]"></oc-tile-stub>
             </li>
           </ul>
diff --git a/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap b/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
index 696c4b9c21c..0fc0a97e8af 100644
--- a/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
@@ -32,7 +32,7 @@ exports[`TrashOverview view states should render spaces list 1`] = `
             </th>
           </tr>
         </thead>
-        <tbody>
+        <tbody class="has-item-context-menu">
           <tr class="oc-tbody-tr oc-tbody-tr-1" data-item-id="1" draggable="false" tabindex="-1">
             <td class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-shrink oc-td oc-table-data-cell oc-table-data-cell-icon oc-pl-s">
               <span class="oc-icon oc-icon-m oc-icon-passive oc-pl-m">
diff --git a/packages/web-test-helpers/src/mocks/defaultStubs.ts b/packages/web-test-helpers/src/mocks/defaultStubs.ts
index 5d7bc530fe3..38602abcdb8 100644
--- a/packages/web-test-helpers/src/mocks/defaultStubs.ts
+++ b/packages/web-test-helpers/src/mocks/defaultStubs.ts
@@ -18,5 +18,6 @@ export const defaultStubs = {
   'shared-with-me-section': true,
   'side-bar': true,
   'space-header': true,
+  'whitespace-context-menu': true,
   translate: true
 }