diff --git a/src/components/Member/CurrentMembers.vue b/src/components/Member/CurrentMembers.vue
index 1de85b4056..2274a4f3c6 100644
--- a/src/components/Member/CurrentMembers.vue
+++ b/src/components/Member/CurrentMembers.vue
@@ -8,17 +8,24 @@
 		<NcAppNavigationCaption
 			v-if="isSearching"
 			:name="t('collectives', 'Members')" />
-		<MemberItem
-			v-for="item in searchedMembers"
-			:key="item.singleId"
-			:circleId
-			:currentUserIsAdmin
-			:memberId="item.id"
-			:userId="item.userId"
-			:displayName="item.displayName"
-			:userType="circleMemberType(item)"
-			:level="item.level"
-			:isCurrentUser="isCurrentUser(item)" />
+		<RecycleScroller
+			v-if="searchedMembers.length > 0"
+			class="scroller"
+			:items="searchedMembers"
+			:itemSize="56"
+			keyField="singleId">
+			<template #default="{ item }">
+				<MemberItem
+					:circleId
+					:currentUserIsAdmin
+					:memberId="item.id"
+					:userId="item.userId"
+					:displayName="item.displayName"
+					:userType="circleMemberType(item)"
+					:level="item.level"
+					:isCurrentUser="isCurrentUser(item)" />
+			</template>
+		</RecycleScroller>
 		<MembersHint
 			v-if="isSearching && searchedMembers.length === 0"
 			:hint="t('collectives', 'No search results')" />
@@ -28,11 +35,14 @@
 <script>
 import { getCurrentUser } from '@nextcloud/auth'
 import { t } from '@nextcloud/l10n'
+import { RecycleScroller } from 'vue-virtual-scroller'
 import NcAppNavigationCaption from '@nextcloud/vue/components/NcAppNavigationCaption'
 import MemberItem from './MemberItem.vue'
 import MembersHint from './MembersHint.vue'
 import { circleMemberType } from '../../util/circles.ts'
 
+import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
+
 export default {
 	name: 'CurrentMembers',
 
@@ -40,6 +50,7 @@ export default {
 		MembersHint,
 		MemberItem,
 		NcAppNavigationCaption,
+		RecycleScroller,
 	},
 
 	props: {
@@ -117,3 +128,11 @@ export default {
 	},
 }
 </script>
+
+<style scoped lang="scss">
+.current-members {
+	.scroller {
+		max-height: 370px;
+	}
+}
+</style>
diff --git a/src/components/Page/LandingPageWidgets/MembersWidget.vue b/src/components/Page/LandingPageWidgets/MembersWidget.vue
index 37a9ae653a..d409768549 100644
--- a/src/components/Page/LandingPageWidgets/MembersWidget.vue
+++ b/src/components/Page/LandingPageWidgets/MembersWidget.vue
@@ -185,6 +185,7 @@ export default {
 	},
 
 	mounted() {
+		this.updateShowMembersCountDebounced()
 		window.addEventListener('resize', this.updateShowMembersCountDebounced)
 	},