diff --git a/lib/Helper/CircleHelper.php b/lib/Helper/CircleHelper.php
new file mode 100644
index 000000000..6babfde55
--- /dev/null
+++ b/lib/Helper/CircleHelper.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Tables\Helper;
+
+use OCA\Circles\CirclesManager;
+use OCA\Circles\Model\Member;
+use OCA\Circles\Model\Probes\CircleProbe;
+use OCP\App\IAppManager;
+use OCP\Server;
+use Psr\Log\LoggerInterface;
+use Throwable;
+
+/**
+ * @psalm-suppress UndefinedClass
+ */
+class CircleHelper {
+	private LoggerInterface $logger;
+	private bool $circlesEnabled;
+	private ?CirclesManager $circlesManager;
+
+	/**
+	 * @psalm-suppress UndefinedClass
+	 */
+	public function __construct(
+		LoggerInterface $logger,
+		IAppManager     $appManager,
+		?CirclesManager $circlesManager = null
+	) {
+		$this->logger = $logger;
+		$this->circlesEnabled = $appManager->isEnabledForUser('circles');
+		if ($this->circlesEnabled) {
+			try {
+				$this->circlesManager = $circlesManager ?? Server::get(CirclesManager::class);
+			} catch (Throwable $e) {
+				$this->logger->warning('Failed to get CirclesManager: ' . $e->getMessage());
+				$this->circlesManager = null;
+				$this->circlesEnabled = false;
+			}
+		} else {
+			$this->circlesManager = null;
+		}
+	}
+
+	public function isCirclesEnabled(): bool {
+		return $this->circlesEnabled;
+	}
+
+	public function getCircleDisplayName(string $circleId, string $userId): string {
+		if (!$this->circlesEnabled) {
+			return $circleId;
+		}
+
+		try {
+			$federatedUser = $this->circlesManager->getFederatedUser($userId, Member::TYPE_USER);
+			$this->circlesManager->startSession($federatedUser);
+
+			$circle = $this->circlesManager->getCircle($circleId);
+			return $circle ? ($circle->getDisplayName() ?: $circleId) : $circleId;
+		} catch (Throwable $e) {
+			$this->logger->warning('Failed to get circle display name: ' . $e->getMessage(), [
+				'circleId' => $circleId,
+				'userId' => $userId
+			]);
+			return $circleId;
+		}
+	}
+
+	public function getUserCircles(string $userId): array {
+		if (!$this->circlesEnabled) {
+			return [];
+		}
+
+		try {
+			$federatedUser = $this->circlesManager->getFederatedUser($userId, Member::TYPE_USER);
+			$this->circlesManager->startSession($federatedUser);
+			$probe = new CircleProbe();
+			$probe->mustBeMember();
+			return $this->circlesManager->getCircles($probe);
+		} catch (Throwable $e) {
+			$this->logger->warning('Failed to get user circles: ' . $e->getMessage());
+			return [];
+		}
+	}
+}
diff --git a/lib/Helper/UserHelper.php b/lib/Helper/UserHelper.php
index 3596af057..9b98197a2 100644
--- a/lib/Helper/UserHelper.php
+++ b/lib/Helper/UserHelper.php
@@ -14,17 +14,26 @@
 use OCP\IUserManager;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @psalm-suppress UndefinedClass
+ * @psalm-suppress UndefinedDocblockClass
+ */
 class UserHelper {
 	private IUserManager $userManager;
 
 	private LoggerInterface $logger;
+
 	private IGroupManager $groupManager;
 
+	/**
+	 * @psalm-suppress UndefinedClass
+	 */
 	public function __construct(IUserManager $userManager, LoggerInterface $logger, IGroupManager $groupManager) {
 		$this->userManager = $userManager;
 		$this->logger = $logger;
 		$this->groupManager = $groupManager;
 	}
+
 	public function getUserDisplayName(string $userId): string {
 		try {
 			$user = $this->getUser($userId);
diff --git a/lib/Service/PermissionsService.php b/lib/Service/PermissionsService.php
index cacf99abe..7372302bb 100644
--- a/lib/Service/PermissionsService.php
+++ b/lib/Service/PermissionsService.php
@@ -18,6 +18,7 @@
 use OCA\Tables\Db\ViewMapper;
 use OCA\Tables\Errors\InternalError;
 use OCA\Tables\Errors\NotFoundError;
+use OCA\Tables\Helper\CircleHelper;
 use OCA\Tables\Helper\ConversionHelper;
 use OCA\Tables\Helper\UserHelper;
 use OCA\Tables\Model\Permissions;
@@ -25,7 +26,11 @@
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\DB\Exception;
 use Psr\Log\LoggerInterface;
+use Throwable;
 
+/**
+ * @psalm-suppress UndefinedDocblockClass
+ */
 class PermissionsService {
 	private TableMapper $tableMapper;
 
@@ -35,11 +40,14 @@ class PermissionsService {
 
 	private UserHelper $userHelper;
 
+	private CircleHelper $circleHelper;
+
 	protected LoggerInterface $logger;
 
 	protected ?string $userId = null;
 
 	protected bool $isCli = false;
+
 	private ContextMapper $contextMapper;
 
 	public function __construct(
@@ -50,6 +58,7 @@ public function __construct(
 		ShareMapper     $shareMapper,
 		ContextMapper   $contextMapper,
 		UserHelper      $userHelper,
+		CircleHelper    $circleHelper,
 		bool            $isCLI
 	) {
 		$this->tableMapper = $tableMapper;
@@ -60,6 +69,7 @@ public function __construct(
 		$this->userId = $userId;
 		$this->isCli = $isCLI;
 		$this->contextMapper = $contextMapper;
+		$this->circleHelper = $circleHelper;
 	}
 
 
@@ -420,6 +430,7 @@ public function canReadShare(Share $share, ?string $userId = null): bool {
 	 * @param int $elementId
 	 * @param 'table'|'view' $elementType
 	 * @param string $userId
+	 * @return Permissions
 	 * @throws NotFoundError
 	 */
 	public function getSharedPermissionsIfSharedWithMe(int $elementId, string $elementType, string $userId): Permissions {
@@ -436,16 +447,40 @@ public function getSharedPermissionsIfSharedWithMe(int $elementId, string $eleme
 			$this->logger->warning('Exception occurred: '.$e->getMessage().' Permission denied.');
 			return new Permissions();
 		}
-		$additionalShares = [];
+		$groupShares = [];
 		foreach ($userGroups as $userGroup) {
 			try {
-				$additionalShares[] = $this->shareMapper->findAllSharesForNodeFor($elementType, $elementId, $userGroup->getGid(), 'group');
+				$groupShares[] = $this->shareMapper->findAllSharesForNodeFor($elementType, $elementId, $userGroup->getGid(), 'group');
 			} catch (Exception $e) {
 				$this->logger->warning('Exception occurred: '.$e->getMessage().' Permission denied.');
 				return new Permissions();
 			}
 		}
-		$shares = array_merge($shares, ...$additionalShares);
+
+		$shares = array_merge($shares, ...$groupShares);
+
+		if ($this->circleHelper->isCirclesEnabled()) {
+			$circleShares = [];
+
+			try {
+				$userCircles = $this->circleHelper->getUserCircles($userId);
+			} catch (Throwable $e) {
+				$this->logger->warning('Exception occurred: ' . $e->getMessage() . ' Permission denied.');
+				return new Permissions();
+			}
+
+			foreach ($userCircles as $userCircle) {
+				try {
+					$circleShares[] = $this->shareMapper->findAllSharesForNodeFor($elementType, $elementId, $userCircle->getSingleId(), 'circle');
+				} catch (Exception $e) {
+					$this->logger->warning('Exception occurred: ' . $e->getMessage() . ' Permission denied.');
+					return new Permissions();
+				}
+			}
+
+			$shares = array_merge($shares, ...$circleShares);
+		}
+
 		if (count($shares) > 0) {
 			$read = array_reduce($shares, function ($carry, $share) {
 				return $carry || ($share->getPermissionRead());
@@ -520,7 +555,7 @@ private function hasPermission(int $existingPermissions, string $permissionName)
 		$constantName = 'PERMISSION_' . strtoupper($permissionName);
 		try {
 			$permissionBit = constant(Application::class . "::$constantName");
-		} catch (\Throwable $t) {
+		} catch (Throwable $t) {
 			$this->logger->error('Unexpected permission string {permission}', [
 				'app' => Application::APP_ID,
 				'permission' => $permissionName,
diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php
index 53f39ae83..033f2a1fc 100644
--- a/lib/Service/ShareService.php
+++ b/lib/Service/ShareService.php
@@ -24,9 +24,9 @@
 use OCA\Tables\Errors\InternalError;
 use OCA\Tables\Errors\NotFoundError;
 use OCA\Tables\Errors\PermissionError;
+use OCA\Tables\Helper\CircleHelper;
 use OCA\Tables\Helper\GroupHelper;
 use OCA\Tables\Helper\UserHelper;
-
 use OCA\Tables\Model\Permissions;
 use OCA\Tables\ResponseDefinitions;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -35,9 +35,11 @@
 use OCP\DB\Exception;
 use OCP\IDBConnection;
 use Psr\Log\LoggerInterface;
+use Throwable;
 
 /**
  * @psalm-import-type TablesShare from ResponseDefinitions
+ * @psalm-suppress UndefinedDocblockClass
  */
 class ShareService extends SuperService {
 	use TTransactional;
@@ -51,7 +53,11 @@ class ShareService extends SuperService {
 	protected UserHelper $userHelper;
 
 	protected GroupHelper $groupHelper;
+
+	protected CircleHelper $circleHelper;
+
 	private ContextNavigationMapper $contextNavigationMapper;
+
 	private IDBConnection $dbc;
 
 	public function __construct(
@@ -63,6 +69,7 @@ public function __construct(
 		ViewMapper $viewMapper,
 		UserHelper $userHelper,
 		GroupHelper $groupHelper,
+		CircleHelper $circleHelper,
 		ContextNavigationMapper $contextNavigationMapper,
 		IDBConnection $dbc,
 	) {
@@ -72,6 +79,7 @@ public function __construct(
 		$this->viewMapper = $viewMapper;
 		$this->userHelper = $userHelper;
 		$this->groupHelper = $groupHelper;
+		$this->circleHelper = $circleHelper;
 		$this->contextNavigationMapper = $contextNavigationMapper;
 		$this->dbc = $dbc;
 	}
@@ -163,7 +171,17 @@ private function findElementsSharedWithMe(string $elementType = 'table', ?string
 				$shares = $this->mapper->findAllSharesFor($elementType, $userGroup->getGid(), $userId, 'group');
 				$elementsSharedWithMe = array_merge($elementsSharedWithMe, $shares);
 			}
-		} catch (Exception $e) {
+
+			// get all views or tables that are shared with me by circle
+			if ($this->circleHelper->isCirclesEnabled()) {
+				$userCircles = $this->circleHelper->getUserCircles($userId);
+
+				foreach ($userCircles as $userCircle) {
+					$shares = $this->mapper->findAllSharesFor($elementType, $userCircle->getSingleId(), $userId, 'circle');
+					$elementsSharedWithMe = array_merge($elementsSharedWithMe, $shares);
+				}
+			}
+		} catch (Throwable $e) {
 			throw new InternalError($e->getMessage());
 		}
 		foreach ($elementsSharedWithMe as $share) {
@@ -398,6 +416,16 @@ private function addReceiverDisplayName(Share $share):Share {
 			$share->setReceiverDisplayName($this->userHelper->getUserDisplayName($share->getReceiver()));
 		} elseif ($share->getReceiverType() === 'group') {
 			$share->setReceiverDisplayName($this->groupHelper->getGroupDisplayName($share->getReceiver()));
+		} elseif ($share->getReceiverType() === 'circle') {
+			if ($this->circleHelper->isCirclesEnabled()) {
+				$share->setReceiverDisplayName($this->circleHelper->getCircleDisplayName($share->getReceiver(), $this->userId));
+			} else {
+				$this->logger->info(
+					'Could not get display name for receiver type {type}',
+					['type' => $share->getReceiverType()]
+				);
+				$share->setReceiverDisplayName($share->getReceiver());
+			}
 		} else {
 			$this->logger->info('can not use receiver type to get display name');
 			$share->setReceiverDisplayName($share->getReceiver());
diff --git a/src/modules/sidebar/mixins/shareAPI.js b/src/modules/sidebar/mixins/shareAPI.js
index a60e32665..9567254ad 100644
--- a/src/modules/sidebar/mixins/shareAPI.js
+++ b/src/modules/sidebar/mixins/shareAPI.js
@@ -6,8 +6,11 @@ import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import '@nextcloud/dialogs/style.css'
 import displayError from '../../../shared/utils/displayError.js'
+import ShareTypes from '../../../shared/mixins/shareTypesMixin.js'
 
 export default {
+	mixins: [ShareTypes],
+
 	methods: {
 		async getSharedWithFromBE() {
 			try {
@@ -32,7 +35,11 @@ export default {
 				nodeType: this.isView ? 'view' : 'table',
 				nodeId: this.activeElement.id,
 				receiver: share.user,
-				receiverType: (share.isNoUser) ? 'group' : 'user',
+				receiverType: share.shareType === this.SHARE_TYPES.SHARE_TYPE_USER
+					? 'user'
+					: share.shareType === this.SHARE_TYPES.SHARE_TYPE_GROUP
+						? 'group'
+						: 'circle',
 				permissionRead: true,
 				permissionCreate: true,
 				permissionUpdate: true,
@@ -45,8 +52,11 @@ export default {
 				displayError(e, t('tables', 'Could not create share.'))
 				return false
 			}
-			if (this.isView) await this.$store.dispatch('setViewHasShares', { viewId: this.activeElement.id, hasShares: true })
-			else await this.$store.dispatch('setTableHasShares', { tableId: this.isView ? this.activeElement.tableId : this.activeElement.id, hasShares: true })
+			if (this.isView) {
+				await this.$store.dispatch('setViewHasShares', { viewId: this.activeElement.id, hasShares: true })
+			} else {
+				await this.$store.dispatch('setTableHasShares', { tableId: this.isView ? this.activeElement.tableId : this.activeElement.id, hasShares: true })
+			}
 			return true
 		},
 		async removeShareFromBE(shareId) {
diff --git a/src/modules/sidebar/partials/ShareForm.vue b/src/modules/sidebar/partials/ShareForm.vue
index 2d5151125..170298ae4 100644
--- a/src/modules/sidebar/partials/ShareForm.vue
+++ b/src/modules/sidebar/partials/ShareForm.vue
@@ -6,9 +6,9 @@
 	<div class="row space-B">
 		<h3>{{ t('tables', 'Share with accounts or groups') }}</h3>
 		<NcSelect id="ajax" style="width: 100%;" :clear-on-select="true" :hide-selected="true" :internal-search="false"
-			:loading="loading" :options="options" :placeholder="t('tables', 'User or group name …')"
+			:loading="loading" :options="options" :placeholder="t('tables', 'User, group or team …')"
 			:preselect-first="true" :preserve-search="true" :searchable="true" :user-select="true"
-			:get-option-key="(option) => option.key" :aria-label-combobox="t('tables', 'User or group name …')"
+			:get-option-key="(option) => option.key" :aria-label-combobox="t('tables', 'User, group or team …')"
 			label="displayName" @search="asyncFind" @input="addShare">
 			<template #no-options>
 				{{ t('tables', 'No recommendations. Start typing.') }}
@@ -51,6 +51,10 @@ export default {
 			type: Boolean,
 			default: true,
 		},
+		selectCircles: {
+			type: Boolean,
+			default: true,
+		},
 	},
 
 	computed: {
@@ -100,7 +104,7 @@ export default {
 
 		filterOutUnwantedItems(items) {
 			const shareTypesList = this.getShareTypes()
-			const shareTypes = { 0: 'user', 1: 'group' }
+			const shareTypes = { 0: 'user', 1: 'group', 7: 'circle' }
 
 			// Filter out current user and sort
 			items = items.filter((item) => !(item.shareType === this.SHARE_TYPES.SHARE_TYPE_USER && item.shareWith === this.currentUserId)).sort((a, b) => a.shareType - b.shareType)
@@ -113,13 +117,24 @@ export default {
 		},
 
 		formatResult(result) {
+			const isUser = result.source.startsWith('users')
+			const isGroup = result.source.startsWith('groups')
+
 			return {
 				shareWith: result.id,
-				shareType: result.source.startsWith('users') ? this.SHARE_TYPES.SHARE_TYPE_USER : this.SHARE_TYPES.SHARE_TYPE_GROUP,
+				shareType: isUser
+					? this.SHARE_TYPES.SHARE_TYPE_USER
+					: isGroup
+						? this.SHARE_TYPES.SHARE_TYPE_GROUP
+						: this.SHARE_TYPES.SHARE_TYPE_CIRCLE,
 				user: result.id,
-				isNoUser: !result.source.startsWith('users'),
+				isNoUser: !isUser,
 				displayName: result.label,
-				icon: result.icon || result.source.startsWith('users') ? 'icon-user' : 'icon-group',
+				icon: isUser
+					? 'icon-user'
+					: isGroup
+						? 'icon-group'
+						: 'icon-circles',
 				key: result.source + '-' + result.id,
 			}
 		},
@@ -131,15 +146,21 @@ export default {
 		 * @return {object}
 		 */
 		formatRecommendations(result) {
+			const isUser = result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_USER
+			const isGroup = result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_GROUP
+
 			return {
 				shareWith: result.value.shareWith,
 				shareType: result.value.shareType,
 				user: result.uuid || result.value.shareWith,
-				isNoUser: result.value.shareType !== this.SHARE_TYPES.SHARE_TYPE_USER,
+				isNoUser: !isUser,
 				displayName: result.name || result.label,
-				icon: result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_USER ? 'icon-user' : 'icon-group',
-				// Vue unique binding to render within Multiselect's AvatarSelectOption
-				key: result.uuid || result.value.shareWith + '-' + result.value.shareType + '-' + result.name || result.label,
+				icon: isUser
+					? 'icon-user'
+					: isGroup
+						? 'icon-group'
+						: 'icon-circle',
+				key: result.uuid || result.value.shareWith + '-' + result.value.shareType + '-' + (result.name || result.label),
 			}
 		},
 
diff --git a/src/modules/sidebar/partials/ShareList.vue b/src/modules/sidebar/partials/ShareList.vue
index 45dacaeda..851afad9d 100644
--- a/src/modules/sidebar/partials/ShareList.vue
+++ b/src/modules/sidebar/partials/ShareList.vue
@@ -12,11 +12,11 @@
 				class="row">
 				<div class="fix-col-2">
 					<div style="display:flex; align-items: center;">
-						<NcAvatar :user="share.receiver" :is-no-user="share.receiverType !== 'user'" />
+						<NcAvatar :user="getShareAvatar(share)" :is-no-user="share.receiverType !== 'user'" />
 					</div>
 					<div class="userInfo">
 						<div :class="{'high-line-height': !personHasTableManagePermission(share.receiver)}">
-							{{ share.receiverDisplayName }}{{ share.receiverType === 'group' ? ' (' + t('tables', 'group') + ')' : '' }}
+							{{ getShareDisplayName(share) }}
 						</div>
 						<div v-if="personHasTableManagePermission(share.receiver)">
 							{{ '(' + t('tables', 'Table manager') + ')' }}
@@ -164,10 +164,6 @@ export default {
 	computed: {
 		...mapState(['tables', 'showSidebar']),
 		...mapGetters(['isLoadingSomething', 'activeElement', 'isView']),
-		sortedShares() {
-			return [...this.userShares, ...this.groupShares].slice()
-				.sort(this.sortByDisplayName)
-		},
 		getShares() {
 			if (this.isView) {
 				return this.viewShares
@@ -177,7 +173,6 @@ export default {
 		},
 		viewShares() {
 			return this.shares.filter(share => share.nodeType === 'view')
-			// .filter(share => this.tableShares.find(tableShare => tableShare.nodeId === this.activeElement.tableId && share.receiver === tableShare.receiver && tableShare.permissionManage) === undefined)
 		},
 		tableShares() {
 			return this.shares.filter(share => share.nodeType === 'table')
@@ -194,11 +189,6 @@ export default {
 		async openDashboard() {
 			await this.$router.push('/table/' + this.activeElement.tableId)
 		},
-		sortByDisplayName(a, b) {
-			if (a.displayName.toLowerCase() < b.displayName.toLowerCase()) return -1
-			if (a.displayName.toLowerCase() > b.displayName.toLowerCase()) return 1
-			return 0
-		},
 		actionDelete(share) {
 			this.$emit('remove', share)
 		},
@@ -214,6 +204,20 @@ export default {
 		personHasTableManagePermission(userId) {
 			return this.tableShares.find(share => share.receiver === userId)?.permissionManage
 		},
+		getShareAvatar(share) {
+			return share.receiverDisplayName || share.receiver
+		},
+		getShareDisplayName(share) {
+			const name = share.receiverDisplayName || share.receiver
+			const type = share.receiverType
+
+			if (type === 'group') {
+				return `${name} (${t('tables', 'group')})`
+			} else if (type === 'circle') {
+				return `${name} (${t('tables', 'team')})`
+			}
+			return name
+		},
 	},
 }
 </script>
diff --git a/src/shared/mixins/searchUserGroup.js b/src/shared/mixins/searchUserGroup.js
index f8e2188b8..65f6e03b6 100644
--- a/src/shared/mixins/searchUserGroup.js
+++ b/src/shared/mixins/searchUserGroup.js
@@ -44,23 +44,24 @@ export default {
 	},
 	methods: {
 		getShareTypes() {
-			const types = []
-			if (this.selectUsers) {
-				types.push(this.SHARE_TYPES.SHARE_TYPE_USER)
-			}
-			if (this.selectGroups) {
-				types.push(this.SHARE_TYPES.SHARE_TYPE_GROUP)
-			}
-			return types
+			return [
+				...(this.selectUsers ? [this.SHARE_TYPES.SHARE_TYPE_USER] : []),
+				...(this.selectGroups ? [this.SHARE_TYPES.SHARE_TYPE_GROUP] : []),
+				...(this.selectCircles ? [this.SHARE_TYPES.SHARE_TYPE_CIRCLE] : []),
+			]
 		},
 		getShareTypeString() {
-			if (this.selectUsers && !this.selectGroups) {
-				return 'User'
-			} else if (!this.selectUsers && this.selectGroups) {
-				return 'Group'
-			} else {
-				return 'User or group'
+			const shareTypes = this.getShareTypes()
+			const typeLabels = {
+				[this.SHARE_TYPES.SHARE_TYPE_USER]: 'User',
+				[this.SHARE_TYPES.SHARE_TYPE_GROUP]: 'Group',
+				[this.SHARE_TYPES.SHARE_TYPE_CIRCLE]: 'Circle',
 			}
+
+			const selectedLabels = shareTypes.map(type => typeLabels[type])
+			return selectedLabels.length > 0
+				? selectedLabels.join(' or ')
+				: 'User, group or circle'
 		},
 		getPlaceholder() {
 			return t('tables', '{shareTypeString}...', { shareTypeString: this.getShareTypeString() })