diff --git a/changelog/unreleased/enhancement-admin-change-spaces-quota-batch-action b/changelog/unreleased/enhancement-admin-change-spaces-quota-batch-action
new file mode 100644
index 00000000000..0ae3da11125
--- /dev/null
+++ b/changelog/unreleased/enhancement-admin-change-spaces-quota-batch-action
@@ -0,0 +1,6 @@
+Enhancement: Batch edit quota in admin panel
+
+We've added the batch edit quota functionality to the admin panel for users personal space and in the spaces list
+
+https://github.com/owncloud/web/pull/8387
+https://github.com/owncloud/web/issues/8417
\ No newline at end of file
diff --git a/packages/web-app-admin-settings/src/components/General/AppearanceSection.vue b/packages/web-app-admin-settings/src/components/General/AppearanceSection.vue
index 9d596e1f91f..123030fce6c 100644
--- a/packages/web-app-admin-settings/src/components/General/AppearanceSection.vue
+++ b/packages/web-app-admin-settings/src/components/General/AppearanceSection.vue
@@ -51,10 +51,10 @@ import { useStore } from 'web-pkg'
 
 export default defineComponent({
   name: 'AppearanceSection',
-  mixins: [UploadLogo, ResetLogo],
   components: {
     ContextActionMenu
   },
+  mixins: [UploadLogo, ResetLogo],
   setup() {
     const store = useStore()
     const instance = getCurrentInstance().proxy as any
diff --git a/packages/web-app-admin-settings/src/components/Spaces/ContextActions.vue b/packages/web-app-admin-settings/src/components/Spaces/ContextActions.vue
index 80609fea8db..46a41919187 100644
--- a/packages/web-app-admin-settings/src/components/Spaces/ContextActions.vue
+++ b/packages/web-app-admin-settings/src/components/Spaces/ContextActions.vue
@@ -4,7 +4,7 @@
     <quota-modal
       v-if="quotaModalIsOpen"
       :cancel="closeQuotaModal"
-      :space="quotaModalSelectedSpace"
+      :spaces="items"
       @space-quota-updated="spaceQuotaUpdated"
     />
   </div>
@@ -77,8 +77,6 @@ export default defineComponent({
       }
       return sections
     })
-
-    const quotaModalSelectedSpace = computed(() => instance.$data.$_editQuota_selectedSpace)
     const quotaModalIsOpen = computed(() => instance.$data.$_editQuota_modalOpen)
     const closeQuotaModal = () => {
       instance.$_editQuota_closeModal()
@@ -88,7 +86,6 @@ export default defineComponent({
     }
     return {
       menuSections,
-      quotaModalSelectedSpace,
       quotaModalIsOpen,
       closeQuotaModal,
       spaceQuotaUpdated
diff --git a/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue b/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue
index 0f35b1a9c47..231af29a132 100644
--- a/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue
+++ b/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue
@@ -3,7 +3,7 @@
     <quota-modal
       v-if="quotaModalIsOpen"
       :cancel="closeQuotaModal"
-      :space="resources[0]"
+      :spaces="[resources[0]]"
       @space-quota-updated="spaceQuotaUpdated"
     />
     <oc-list id="oc-spaces-actions-sidebar" class-name="oc-mt-s">
diff --git a/packages/web-app-admin-settings/src/components/Users/ContextActions.vue b/packages/web-app-admin-settings/src/components/Users/ContextActions.vue
index 1ac640f42e6..799e6184117 100644
--- a/packages/web-app-admin-settings/src/components/Users/ContextActions.vue
+++ b/packages/web-app-admin-settings/src/components/Users/ContextActions.vue
@@ -1,6 +1,12 @@
 <template>
   <div>
     <context-action-menu :menu-sections="menuSections" :items="items" />
+    <quota-modal
+      v-if="quotaModalIsOpen"
+      :cancel="closeQuotaModal"
+      :spaces="selectedPersonalDrives"
+      @space-quota-updated="spaceQuotaUpdated"
+    />
   </div>
 </template>
 
@@ -8,14 +14,27 @@
 import ShowDetails from '../../mixins/showDetails'
 import Delete from '../../mixins/users/delete'
 import Edit from '../../mixins/users/edit'
-import { computed, defineComponent, getCurrentInstance, PropType, unref } from 'vue'
+import {
+  computed,
+  defineComponent,
+  getCurrentInstance,
+  PropType,
+  unref,
+  watch,
+  toRaw,
+  ref
+} from 'vue'
 import ContextActionMenu from 'web-pkg/src/components/ContextActions/ContextActionMenu.vue'
 import { User } from 'web-client/src/generated'
+import QuotaModal from 'web-pkg/src/components/Spaces/QuotaModal.vue'
+import EditQuota from 'web-pkg/src/mixins/spaces/editQuota'
+import { SpaceResource } from 'web-client/src'
+import { useGettext } from 'vue3-gettext'
 
 export default defineComponent({
   name: 'ContextActions',
-  components: { ContextActionMenu },
-  mixins: [Delete, Edit, ShowDetails],
+  components: { ContextActionMenu, QuotaModal },
+  mixins: [Delete, Edit, ShowDetails, EditQuota],
   props: {
     items: {
       type: Array as PropType<User[]>,
@@ -24,13 +43,36 @@ export default defineComponent({
   },
   setup(props) {
     const instance = getCurrentInstance().proxy as any
-
+    const { $gettext } = useGettext()
     const filterParams = computed(() => ({ resources: props.items }))
+    const selectedPersonalDrives = ref([])
+    watch(
+      () => props.items,
+      async () => {
+        selectedPersonalDrives.value.splice(0, unref(selectedPersonalDrives).length)
+        props.items.forEach((user) => {
+          const drive = toRaw(user.drive)
+          if (drive === undefined || drive.id === undefined) {
+            return
+          }
+          const spaceResource = {
+            id: drive.id,
+            name: $gettext(' of %{name}', { name: user.displayName }),
+            spaceQuota: drive.quota
+          } as SpaceResource
+          selectedPersonalDrives.value.push(spaceResource)
+        })
+      },
+      { deep: true, immediate: true }
+    )
     const menuItemsPrimaryActions = computed(() =>
       [...instance.$_edit_items, ...instance.$_delete_items].filter((item) =>
         item.isEnabled(unref(filterParams))
       )
     )
+    const menuItemsSecondaryActions = computed(() =>
+      [...instance.$_editQuota_items].filter((item) => item.isEnabled(unref(filterParams)))
+    )
 
     const menuItemsSidebar = computed(() =>
       [...instance.$_showDetails_items].filter((item) => item.isEnabled(unref(filterParams)))
@@ -45,6 +87,12 @@ export default defineComponent({
           items: unref(menuItemsPrimaryActions)
         })
       }
+      if (unref(menuItemsSecondaryActions).length) {
+        sections.push({
+          name: 'secondaryActions',
+          items: unref(menuItemsSecondaryActions)
+        })
+      }
       if (unref(menuItemsSidebar).length) {
         sections.push({
           name: 'sidebar',
@@ -54,8 +102,20 @@ export default defineComponent({
       return sections
     })
 
+    const quotaModalIsOpen = computed(() => instance.$data.$_editQuota_modalOpen)
+    const closeQuotaModal = () => {
+      instance.$_editQuota_closeModal()
+    }
+    const spaceQuotaUpdated = (quota) => {
+      instance.$data.$_editQuota_selectedSpace.spaceQuota = quota
+    }
+
     return {
-      menuSections
+      menuSections,
+      quotaModalIsOpen,
+      closeQuotaModal,
+      spaceQuotaUpdated,
+      selectedPersonalDrives
     }
   }
 })
diff --git a/packages/web-app-admin-settings/src/views/Spaces.vue b/packages/web-app-admin-settings/src/views/Spaces.vue
index 23c6ebee1a4..ab2ab14939e 100644
--- a/packages/web-app-admin-settings/src/views/Spaces.vue
+++ b/packages/web-app-admin-settings/src/views/Spaces.vue
@@ -38,6 +38,12 @@
         </div>
       </template>
       <template #mainContent>
+        <quota-modal
+          v-if="quotaModalIsOpen"
+          :cancel="closeQuotaModal"
+          :spaces="selectedSpaces"
+          @space-quota-updated="spaceQuotaUpdated"
+        />
         <no-content-message
           v-if="!spaces.length"
           id="admin-settings-spaces-empty"
@@ -97,6 +103,8 @@ import ActionsPanel from '../components/Spaces/SideBar/ActionsPanel.vue'
 import Delete from 'web-pkg/src/mixins/spaces/delete'
 import Disable from 'web-pkg/src/mixins/spaces/disable'
 import Restore from 'web-pkg/src/mixins/spaces/restore'
+import EditQuota from 'web-pkg/src/mixins/spaces/editQuota'
+import QuotaModal from 'web-pkg/src/components/Spaces/QuotaModal.vue'
 import { useSideBar } from 'web-pkg/src/composables/sideBar'
 import { useGettext } from 'vue3-gettext'
 
@@ -108,9 +116,10 @@ export default defineComponent({
     NoContentMessage,
     ContextActions,
     SpaceInfo,
-    BatchActions
+    BatchActions,
+    QuotaModal
   },
-  mixins: [Delete, Disable, Restore],
+  mixins: [Delete, Disable, Restore, EditQuota],
   provide() {
     return {
       resource: computed(() => this.selectedSpaces[0])
@@ -126,6 +135,7 @@ export default defineComponent({
     const { sideBarOpen, sideBarActivePanel } = useSideBar()
 
     const loadResourcesEventToken = ref(null)
+    const updateQuotaForSpaceEventToken = ref(null)
     const template = ref(null)
     const listHeaderPosition = ref(0)
     const selectedSpaces = ref([])
@@ -176,6 +186,7 @@ export default defineComponent({
 
     const batchActions = computed(() => {
       return [
+        ...instance.$_editQuota_items,
         ...instance.$_restore_items,
         ...instance.$_delete_items,
         ...instance.$_disable_items
@@ -253,13 +264,35 @@ export default defineComponent({
       calculateListHeaderPosition()
       window.addEventListener('resize', calculateListHeaderPosition)
       resizeObserver.observe(unref(appBarActionsRef))
+
+      updateQuotaForSpaceEventToken.value = eventBus.subscribe(
+        'app.admin-settings.spaces.space.quota.updated',
+        ({ spaceId, quota }) => {
+          const space = unref(spaces).find((s) => s.id === spaceId)
+          if (space) {
+            space.spaceQuota = quota
+          }
+        }
+      )
     })
 
     onBeforeUnmount(() => {
       eventBus.unsubscribe('app.admin-settings.list.load', unref(loadResourcesEventToken))
+      eventBus.unsubscribe(
+        'app.admin-settings.spaces.space.quota.updated',
+        unref(updateQuotaForSpaceEventToken)
+      )
       resizeObserver.unobserve(unref(appBarActionsRef))
     })
 
+    const quotaModalIsOpen = computed(() => instance.$data.$_editQuota_modalOpen)
+    const closeQuotaModal = () => {
+      instance.$_editQuota_closeModal()
+    }
+    const spaceQuotaUpdated = (quota) => {
+      instance.$data.$_editQuota_selectedSpace.spaceQuota = quota
+    }
+
     return {
       sideBarOpen,
       sideBarActivePanel,
@@ -278,7 +311,10 @@ export default defineComponent({
       unselectAllSpaces,
       limitedScreenSpace,
       appBarActionsRef,
-      onResize
+      onResize,
+      quotaModalIsOpen,
+      closeQuotaModal,
+      spaceQuotaUpdated
     }
   }
 })
diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
index 9849eff63c0..cf94f2c7136 100644
--- a/packages/web-app-admin-settings/src/views/Users.vue
+++ b/packages/web-app-admin-settings/src/views/Users.vue
@@ -83,6 +83,12 @@
       @cancel="toggleCreateUserModal"
       @confirm="createUser"
     />
+    <quota-modal
+      v-if="quotaModalIsOpen"
+      :cancel="closeQuotaModal"
+      :spaces="selectedPersonalDrives"
+      @space-quota-updated="spaceQuotaUpdated"
+    />
   </div>
 </template>
 
@@ -95,6 +101,7 @@ import ContextActions from '../components/Users/ContextActions.vue'
 import DetailsPanel from '../components/Users/SideBar/DetailsPanel.vue'
 import EditPanel from '../components/Users/SideBar/EditPanel.vue'
 import BatchActions from 'web-pkg/src/components/BatchActions.vue'
+import QuotaModal from 'web-pkg/src/components/Spaces/QuotaModal.vue'
 import Delete from '../mixins/users/delete'
 import {
   queryItemAsString,
@@ -120,6 +127,10 @@ import AppTemplate from '../components/AppTemplate.vue'
 import { useSideBar } from 'web-pkg/src/composables/sideBar'
 import ItemFilter from 'web-pkg/src/components/ItemFilter.vue'
 import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
+import EditQuota from 'web-pkg/src/mixins/spaces/editQuota'
+import { toRaw } from 'vue'
+import { SpaceResource } from 'web-client/src'
+import { useGettext } from 'vue3-gettext'
 
 export default defineComponent({
   name: 'UsersView',
@@ -130,11 +141,13 @@ export default defineComponent({
     CreateUserModal,
     BatchActions,
     ContextActions,
-    ItemFilter
+    ItemFilter,
+    QuotaModal
   },
-  mixins: [Delete],
+  mixins: [Delete, EditQuota],
   setup() {
     const instance = getCurrentInstance().proxy as any
+    const { $gettext } = useGettext()
     const store = useStore()
     const accessToken = useAccessToken({ store })
     const { graphClient } = useGraphClient()
@@ -190,26 +203,45 @@ export default defineComponent({
       loadUsersTask.perform(groupIds)
     }
 
+    const selectedPersonalDrives = ref([])
     watch(
-      selectedUsers,
+      () => unref(selectedUsers).length,
       async () => {
-        const loadAdditionalData = unref(selectedUsers).length === 1
-        if (loadAdditionalData && unref(loadedUser)?.id === unref(selectedUsers)[0].id) {
-          // current user is already loaded
-          return
-        }
-
         sideBarLoading.value = true
-        if (loadAdditionalData) {
-          loadedUser.value = await loadAdditionalUserDataTask.perform(unref(selectedUsers)[0])
-          sideBarLoading.value = false
-          return
-        }
+        // Load additional user data
+        const requests = []
+        unref(selectedUsers).forEach((user) => {
+          requests.push(loadAdditionalUserDataTask.perform(user))
+        })
 
-        loadedUser.value = null
+        const loadedUsers = await Promise.all(requests)
+        unref(selectedUsers).forEach((user) => {
+          const additionalUserData = loadedUsers.find((loadedUser) => loadedUser.id === user.id)
+          Object.assign(user, additionalUserData)
+          if (unref(selectedUsers).length === 1) {
+            loadedUser.value = additionalUserData
+            sideBarLoading.value = false
+            return
+          }
+        })
+        if (unref(selectedUsers).length !== 1) {
+          loadedUser.value = null
+        }
         sideBarLoading.value = false
-      },
-      { deep: true }
+        selectedPersonalDrives.value.splice(0, unref(selectedPersonalDrives).length)
+        unref(selectedUsers).forEach((user) => {
+          const drive = toRaw(user.drive)
+          if (drive === undefined || drive.id === undefined) {
+            return
+          }
+          const spaceResource = {
+            id: drive.id,
+            name: $gettext(' of %{name}', { name: user.displayName }),
+            spaceQuota: drive.quota
+          } as SpaceResource
+          selectedPersonalDrives.value.push(spaceResource)
+        })
+      }
     )
 
     const calculateListHeaderPosition = () => {
@@ -217,7 +249,7 @@ export default defineComponent({
     }
 
     const batchActions = computed(() => {
-      return [...instance.$_delete_items].filter((item) =>
+      return [...instance.$_delete_items, ...instance.$_editQuota_items].filter((item) =>
         item.isEnabled({ resources: unref(selectedUsers) })
       )
     })
@@ -245,6 +277,14 @@ export default defineComponent({
       eventBus.unsubscribe('app.admin-settings.users.user.updated', userUpdatedEventToken)
     })
 
+    const quotaModalIsOpen = computed(() => instance.$data.$_editQuota_modalOpen)
+    const closeQuotaModal = () => {
+      instance.$_editQuota_closeModal()
+    }
+    const spaceQuotaUpdated = (quota) => {
+      instance.$data.$_editQuota_selectedSpace.spaceQuota = quota
+    }
+
     return {
       ...useSideBar(),
       template,
@@ -261,7 +301,11 @@ export default defineComponent({
       listHeaderPosition,
       createUserModalOpen,
       batchActions,
-      filterGroups
+      filterGroups,
+      quotaModalIsOpen,
+      closeQuotaModal,
+      spaceQuotaUpdated,
+      selectedPersonalDrives
     }
   },
   computed: {
diff --git a/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts
index 8797617ca89..7433d047252 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts
@@ -27,7 +27,7 @@ const selectors = {
   batchActionsStub: 'batch-actions-stub'
 }
 
-const mixins = ['$_disable_items', '$_restore_items', '$_delete_items']
+const mixins = ['$_disable_items', '$_restore_items', '$_delete_items', '$_editQuota_items']
 jest.mock('web-pkg/src/composables/appDefaults')
 
 describe('Spaces view', () => {
diff --git a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
index 9fb04d68456..8ee773617f0 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
@@ -8,12 +8,14 @@ import {
   defaultComponentMocks,
   defaultPlugins,
   defaultStoreMockOptions,
+  getActionMixinMocks,
   mount,
   shallowMount
 } from 'web-test-helpers'
 import { AxiosResponse } from 'axios'
 import { queryItemAsString } from 'web-pkg'
 
+const mixins = ['$_delete_items', '$_editQuota_items']
 jest.mock('web-pkg/src/composables/appDefaults')
 
 const getDefaultUser = () => {
@@ -373,7 +375,8 @@ function getMountedWrapper({
 } = {}) {
   jest.mocked(queryItemAsString).mockImplementation(() => queryItem)
   const mocks = {
-    ...defaultComponentMocks()
+    ...defaultComponentMocks(),
+    ...getActionMixinMocks({ actions: mixins })
   }
   mocks.$clientService.graphAuthenticated.mockImplementation(() => graph)
 
@@ -388,19 +391,23 @@ function getMountedWrapper({
 
   return {
     mocks,
-    wrapper: mountType(Users, {
-      global: {
-        plugins: [...defaultPlugins(), store],
-        mocks,
-        stubs: {
-          CreateUserModal: true,
-          AppLoadingSpinner: true,
-          OcBreadcrumb: true,
-          OcTable: true,
-          ItemFilter: true,
-          BatchActions: true
+    wrapper: mountType(
+      { ...Users, mixins },
+      {
+        global: {
+          plugins: [...defaultPlugins(), store],
+          mocks,
+          stubs: {
+            CreateUserModal: true,
+            AppLoadingSpinner: true,
+            OcBreadcrumb: true,
+            NoContentMessage: true,
+            OcTable: true,
+            ItemFilter: true,
+            BatchActions: true
+          }
         }
       }
-    })
+    )
   }
 }
diff --git a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap
index 9c1754e6408..813fcec5969 100644
--- a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap
@@ -20,6 +20,7 @@ exports[`Spaces view loading states should render spaces list after loading has
           <!--v-if-->
         </div>
       </div>
+      <!--v-if-->
       <div>
         <spaces-list-stub class="" headerposition="0" selectedspaces="" spaces="[object Object]"></spaces-list-stub>
       </div>
diff --git a/packages/web-app-files/src/components/SideBar/Actions/SpaceActions.vue b/packages/web-app-files/src/components/SideBar/Actions/SpaceActions.vue
index 14a5fa5ea9a..f5ba5036b3f 100644
--- a/packages/web-app-files/src/components/SideBar/Actions/SpaceActions.vue
+++ b/packages/web-app-files/src/components/SideBar/Actions/SpaceActions.vue
@@ -5,7 +5,7 @@
       :cancel="closeReadmeContentModal"
       :space="resources[0]"
     ></readme-content-modal>
-    <quota-modal v-if="quotaModalIsOpen" :cancel="closeQuotaModal" :space="resources[0]" />
+    <quota-modal v-if="quotaModalIsOpen" :cancel="closeQuotaModal" :spaces="[resources[0]]" />
     <input
       id="space-image-upload-input"
       ref="spaceImageInput"
diff --git a/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue b/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue
index e957e8f5bf3..258e1d278e9 100644
--- a/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue
+++ b/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue
@@ -4,7 +4,7 @@
     <quota-modal
       v-if="quotaModalIsOpen"
       :cancel="closeQuotaModal"
-      :space="quotaModalSelectedSpace"
+      :spaces="quotaModalSelectedSpace"
     />
     <readme-content-modal
       v-if="readmeContentModalIsOpen"
@@ -75,7 +75,7 @@ export default defineComponent({
 
   computed: {
     quotaModalSelectedSpace() {
-      return this.$data.$_editQuota_selectedSpace
+      return [this.$data.$_editQuota_selectedSpace]
     },
     quotaModalIsOpen() {
       return this.$data.$_editQuota_modalOpen
diff --git a/packages/web-app-files/tests/unit/components/Spaces/SpaceContextActions.spec.ts b/packages/web-app-files/tests/unit/components/Spaces/SpaceContextActions.spec.ts
index eddb92d5ca4..1597636d1ba 100644
--- a/packages/web-app-files/tests/unit/components/Spaces/SpaceContextActions.spec.ts
+++ b/packages/web-app-files/tests/unit/components/Spaces/SpaceContextActions.spec.ts
@@ -34,7 +34,10 @@ function getWrapper(space) {
       },
       global: {
         mocks: {
-          ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ path: '/files' }) })
+          ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ path: '/files' }) }),
+          $permissionManager: {
+            canEditSpaceQuota: () => true
+          }
         },
         plugins: [...defaultPlugins(), store]
       }
diff --git a/packages/web-app-files/tests/unit/components/Spaces/SpaceHeader.spec.ts b/packages/web-app-files/tests/unit/components/Spaces/SpaceHeader.spec.ts
index c12b15c5111..189823ba871 100644
--- a/packages/web-app-files/tests/unit/components/Spaces/SpaceHeader.spec.ts
+++ b/packages/web-app-files/tests/unit/components/Spaces/SpaceHeader.spec.ts
@@ -43,7 +43,10 @@ describe('SpaceHeader', () => {
 
 function getWrapper({ space = {}, sideBarOpen = false }) {
   const mocks = {
-    ...defaultComponentMocks()
+    ...defaultComponentMocks(),
+    $permissionManager: {
+      canEditSpaceQuota: () => true
+    }
   }
   const store = createStore(defaultStoreMockOptions)
   return mount(SpaceHeader, {
@@ -53,7 +56,10 @@ function getWrapper({ space = {}, sideBarOpen = false }) {
     },
     global: {
       mocks,
-      plugins: [...defaultPlugins(), store]
+      plugins: [...defaultPlugins(), store],
+      stubs: {
+        'quota-modal': true
+      }
     }
   })
 }
diff --git a/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceContextActions.spec.ts.snap b/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceContextActions.spec.ts.snap
index a69115ba5df..92583e071e8 100644
--- a/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceContextActions.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceContextActions.spec.ts.snap
@@ -16,6 +16,19 @@ exports[`SpaceContextActions action handlers renders actions that are always ava
         </button>
       </li>
     </ul>
+    <ul class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pb-s oc-pt-s oc-files-context-actions-border" id="oc-files-context-actions-secondaryActions">
+      <li class="context-menu oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover">
+        <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-edit-quota-trigger action-menu-item oc-py-s oc-px-m oc-width-1-1" type="button">
+          <!-- @slot Content of the button -->
+          <span class="oc-icon oc-icon-m oc-icon-passive">
+            <!---->
+          </span>
+          <span class="oc-files-context-action-label">Edit quota</span>
+          <!--v-if-->
+          <!--v-if-->
+        </button>
+      </li>
+    </ul>
     <ul class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pb-s oc-pt-s oc-files-context-actions-border" id="oc-files-context-actions-trashBin">
       <li class="context-menu oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover">
         <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-delete-trigger action-menu-item oc-py-s oc-px-m oc-width-1-1" type="button">
diff --git a/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceHeader.spec.ts.snap b/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceHeader.spec.ts.snap
index 0575384695f..82773ea7ef2 100644
--- a/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceHeader.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceHeader.spec.ts.snap
@@ -36,6 +36,19 @@ exports[`SpaceHeader should add the "squashed"-class when the sidebar is opened
                     </button>
                   </li>
                 </ul>
+                <ul class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pb-s oc-pt-s oc-files-context-actions-border" id="oc-files-context-actions-secondaryActions">
+                  <li class="context-menu oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover">
+                    <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-edit-quota-trigger action-menu-item oc-py-s oc-px-m oc-width-1-1" type="button">
+                      <!-- @slot Content of the button -->
+                      <span class="oc-icon oc-icon-m oc-icon-passive">
+                        <!---->
+                      </span>
+                      <span class="oc-files-context-action-label">Edit quota</span>
+                      <!--v-if-->
+                      <!--v-if-->
+                    </button>
+                  </li>
+                </ul>
                 <ul class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pt-s" id="oc-files-context-actions-trashBin">
                   <li class="context-menu oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover">
                     <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-delete-trigger action-menu-item oc-py-s oc-px-m oc-width-1-1" type="button">
@@ -105,6 +118,19 @@ exports[`SpaceHeader space image should show the default image if no other image
                     </button>
                   </li>
                 </ul>
+                <ul class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pb-s oc-pt-s oc-files-context-actions-border" id="oc-files-context-actions-secondaryActions">
+                  <li class="context-menu oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover">
+                    <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-edit-quota-trigger action-menu-item oc-py-s oc-px-m oc-width-1-1" type="button">
+                      <!-- @slot Content of the button -->
+                      <span class="oc-icon oc-icon-m oc-icon-passive">
+                        <!---->
+                      </span>
+                      <span class="oc-files-context-action-label">Edit quota</span>
+                      <!--v-if-->
+                      <!--v-if-->
+                    </button>
+                  </li>
+                </ul>
                 <ul class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pt-s" id="oc-files-context-actions-trashBin">
                   <li class="context-menu oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover">
                     <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-delete-trigger action-menu-item oc-py-s oc-px-m oc-width-1-1" type="button">
@@ -170,6 +196,19 @@ exports[`SpaceHeader space image should show the set image 1`] = `
                     </button>
                   </li>
                 </ul>
+                <ul class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pb-s oc-pt-s oc-files-context-actions-border" id="oc-files-context-actions-secondaryActions">
+                  <li class="context-menu oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover">
+                    <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-edit-quota-trigger action-menu-item oc-py-s oc-px-m oc-width-1-1" type="button">
+                      <!-- @slot Content of the button -->
+                      <span class="oc-icon oc-icon-m oc-icon-passive">
+                        <!---->
+                      </span>
+                      <span class="oc-files-context-action-label">Edit quota</span>
+                      <!--v-if-->
+                      <!--v-if-->
+                    </button>
+                  </li>
+                </ul>
                 <ul class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pt-s" id="oc-files-context-actions-trashBin">
                   <li class="context-menu oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover">
                     <button class="oc-button oc-rounded oc-button-s oc-button-justify-content-left oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-delete-trigger action-menu-item oc-py-s oc-px-m oc-width-1-1" type="button">
diff --git a/packages/web-pkg/src/components/ContextActions/ActionMenuItem.vue b/packages/web-pkg/src/components/ContextActions/ActionMenuItem.vue
index 0e4edf476c7..347be9a7fc2 100644
--- a/packages/web-pkg/src/components/ContextActions/ActionMenuItem.vue
+++ b/packages/web-pkg/src/components/ContextActions/ActionMenuItem.vue
@@ -7,8 +7,8 @@
       :class="[action.class, 'action-menu-item', 'oc-py-s', 'oc-px-m', 'oc-width-1-1']"
       data-testid="action-handler"
       size="small"
-      v-on="componentListeners"
       justify-content="left"
+      v-on="componentListeners"
     >
       <oc-img
         v-if="action.img"
diff --git a/packages/web-pkg/src/components/Spaces/QuotaModal.vue b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
index adc51279874..a4869f2ea15 100644
--- a/packages/web-pkg/src/components/Spaces/QuotaModal.vue
+++ b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
@@ -20,10 +20,12 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, unref } from 'vue'
+import { defineComponent, unref, PropType } from 'vue'
 import { mapActions, mapMutations } from 'vuex'
 import { useGraphClient } from 'web-pkg/src/composables'
 import QuotaSelect from 'web-pkg/src/components/QuotaSelect.vue'
+import { SpaceResource } from 'web-client/src'
+import { eventBus } from 'web-pkg/src'
 
 export default defineComponent({
   name: 'SpaceQuotaModal',
@@ -31,8 +33,8 @@ export default defineComponent({
     QuotaSelect
   },
   props: {
-    space: {
-      type: Object,
+    spaces: {
+      type: Array as PropType<SpaceResource[]>,
       required: true
     },
     cancel: {
@@ -53,16 +55,21 @@ export default defineComponent({
   },
   computed: {
     confirmButtonDisabled() {
-      return this.space.spaceQuota.total === this.selectedOption
+      return !this.spaces.some((space) => space.spaceQuota.total !== this.selectedOption)
     },
     modalTitle() {
-      return this.$gettextInterpolate(this.$gettext('Change quota for space %{name}'), {
-        name: this.space.name
+      if (this.spaces.length === 1) {
+        return this.$gettext('Change quota for space %{name}', {
+          name: this.spaces[0].name
+        })
+      }
+      return this.$gettext('Change quota for %{count} spaces', {
+        count: this.spaces.length
       })
     }
   },
   mounted() {
-    this.selectedOption = this.space.spaceQuota.total || 0
+    this.selectedOption = this.spaces[0].spaceQuota.total || 0
   },
   methods: {
     ...mapActions(['showMessage']),
@@ -72,35 +79,59 @@ export default defineComponent({
     changeSelectedQuotaOption(option) {
       this.selectedOption = option.value
     },
-    editQuota() {
-      return this.graphClient.drives
-        .updateDrive(this.space.id, { quota: { total: this.selectedOption } }, {})
-        .then(({ data }) => {
-          this.cancel()
-          if (unref(this.$router.currentRoute).name === 'admin-settings-spaces') {
-            this.$emit('spaceQuotaUpdated', data.quota)
-          }
-          this.UPDATE_SPACE_FIELD({
-            id: this.space.id,
-            field: 'spaceQuota',
-            value: data.quota
-          })
-          this.UPDATE_RESOURCE_FIELD({
-            id: this.space.id,
-            field: 'spaceQuota',
-            value: data.quota
-          })
-          this.showMessage({
-            title: this.$gettext('Space quota was changed successfully')
+    async editQuota(): Promise<void> {
+      const requests = this.spaces.map(async (space): Promise<void> => {
+        const { data: driveData } = await this.graphClient.drives.updateDrive(
+          space.id,
+          { quota: { total: this.selectedOption } },
+          {}
+        )
+        this.cancel()
+        if (unref(this.$router.currentRoute).name === 'admin-settings-spaces') {
+          eventBus.publish('app.admin-settings.spaces.space.quota.updated', {
+            spaceId: space.id,
+            quota: driveData.quota
           })
+        }
+        this.UPDATE_SPACE_FIELD({
+          id: space.id,
+          field: 'spaceQuota',
+          value: driveData.quota
         })
-        .catch((error) => {
-          console.error(error)
-          this.showMessage({
-            title: this.$gettext('Failed to change space quota'),
-            status: 'danger'
-          })
+        this.UPDATE_RESOURCE_FIELD({
+          id: space.id,
+          field: 'spaceQuota',
+          value: driveData.quota
+        })
+      })
+      const results = await Promise.allSettled<Array<unknown>>(requests)
+      const succeeded = results.filter((r) => r.status === 'fulfilled')
+      if (succeeded.length) {
+        this.showMessage({
+          title: this.$ngettext(
+            'Space quota was changed successfully',
+            'Space quota of %{count} spaces was changed successfully',
+            succeeded.length,
+            {
+              count: succeeded.length
+            }
+          )
+        })
+      }
+      const errors = results.filter((r) => r.status === 'rejected')
+      if (errors.length) {
+        errors.forEach(console.error)
+        this.showMessage({
+          title: this.$ngettext(
+            'Failed to change space quota',
+            'Failed to change space quota for %{count} spaces',
+            errors.length,
+            {
+              count: errors.length
+            }
+          )
         })
+      }
     }
   }
 })
diff --git a/packages/web-pkg/src/mixins/spaces/editQuota.ts b/packages/web-pkg/src/mixins/spaces/editQuota.ts
index 65866a743b8..dcb787fe3ab 100644
--- a/packages/web-pkg/src/mixins/spaces/editQuota.ts
+++ b/packages/web-pkg/src/mixins/spaces/editQuota.ts
@@ -21,14 +21,16 @@ export default {
           },
           handler: this.$_editQuota_trigger,
           isEnabled: ({ resources }) => {
-            if (resources.length !== 1) {
+            if (!resources || !resources.length) {
               return false
             }
-
-            if (!resources[0].spaceQuota) {
+            const isProjectSpace = 'spaceQuota' in resources[0]
+            if (resources.length === 1 && !isProjectSpace && !resources[0].drive?.quota) {
+              return false
+            }
+            if (resources.some((r) => r.spaceQuota === false)) {
               return false
             }
-
             return this.$permissionManager.canEditSpaceQuota()
           },
           componentType: 'button',
diff --git a/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts b/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
index d69a7ef7972..46256ddf3db 100644
--- a/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
@@ -74,19 +74,27 @@ function getWrapper(graphMock) {
       },
       props: {
         cancel: jest.fn(),
-        space: {
-          id: '1fe58d8b-aa69-4c22-baf7-97dd57479f22',
-          spaceQuota: {
-            remaining: 9999999836,
-            state: 'normal',
-            total: 10000000000,
-            used: 164
+        spaces: [
+          {
+            id: '1fe58d8b-aa69-4c22-baf7-97dd57479f22',
+            spaceQuota: {
+              remaining: 9999999836,
+              state: 'normal',
+              total: 10000000000,
+              used: 164
+            }
           }
-        }
+        ]
       },
       global: {
         stubs: { ...defaultStubs, portal: true, 'oc-modal': true },
-        mocks: { ...defaultComponentMocks(), $clientService },
+        mocks: {
+          ...defaultComponentMocks(),
+          $clientService,
+          $permissionManager: {
+            canEditSpaceQuota: () => true
+          }
+        },
         plugins: [...defaultPlugins(), store]
       }
     })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 07caa32e0e0..3127b1d2cf2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8184,7 +8184,7 @@ packages:
       minipass-pipeline: 1.2.4
       mkdirp: 1.0.4
       p-map: 4.0.0
-      promise-inflight: 1.0.1
+      promise-inflight: 1.0.1_bluebird@3.7.2
       rimraf: 3.0.2
       ssri: 8.0.1
       tar: 6.1.13
@@ -18427,15 +18427,6 @@ packages:
     engines: {node: '>=0.4.0'}
     dev: true
 
-  /promise-inflight/1.0.1:
-    resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
-    peerDependencies:
-      bluebird: '*'
-    peerDependenciesMeta:
-      bluebird:
-        optional: true
-    dev: true
-
   /promise-inflight/1.0.1_bluebird@3.7.2:
     resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
     peerDependencies:
@@ -18684,6 +18675,7 @@ packages:
     engines: {node: '>=0.6'}
     dependencies:
       side-channel: 1.0.4
+    dev: true
 
   /qs/6.5.3:
     resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
diff --git a/tests/e2e/support/objects/app-admin-settings/spaces/actions.ts b/tests/e2e/support/objects/app-admin-settings/spaces/actions.ts
index 9f0e5470cfa..58d2530d964 100644
--- a/tests/e2e/support/objects/app-admin-settings/spaces/actions.ts
+++ b/tests/e2e/support/objects/app-admin-settings/spaces/actions.ts
@@ -33,7 +33,7 @@ export const changeSpaceQuota = async (args: {
   const { page, value, id } = args
   await page.locator(util.format(spaceIdSelector, id)).click()
   await page.waitForSelector(quotaActionBtn)
-  await page.locator(quotaActionBtn).click()
+  await page.locator(`.context-menu`).locator(quotaActionBtn).click()
 
   const searchLocator = await page.locator(spacesQuotaSearchField)
   await searchLocator.fill(value)