diff --git a/apps/meteor/client/hooks/roomActions/useTeamInfoRoomAction.ts b/apps/meteor/client/hooks/roomActions/useTeamInfoRoomAction.ts
index d4b8a1a73a900..7d43f2985d122 100644
--- a/apps/meteor/client/hooks/roomActions/useTeamInfoRoomAction.ts
+++ b/apps/meteor/client/hooks/roomActions/useTeamInfoRoomAction.ts
@@ -2,7 +2,7 @@ import { lazy, useMemo } from 'react';
 
 import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
 
-const TeamsInfoWithRooms = lazy(() => import('../../views/teams/contextualBar/info/TeamsInfoWithRooms'));
+const TeamsInfoWithData = lazy(() => import('../../views/teams/contextualBar/info/TeamsInfoWithData'));
 
 export const useTeamInfoRoomAction = () => {
 	return useMemo(
@@ -13,7 +13,7 @@ export const useTeamInfoRoomAction = () => {
 			full: true,
 			title: 'Teams_Info',
 			icon: 'info-circled',
-			tabComponent: TeamsInfoWithRooms,
+			tabComponent: TeamsInfoWithData,
 			order: 1,
 		}),
 		[],
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/BaseConvertToChannelModal.tsx b/apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/BaseConvertToChannelModal.tsx
similarity index 100%
rename from apps/meteor/client/views/teams/ConvertToChannelModal/BaseConvertToChannelModal.tsx
rename to apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/BaseConvertToChannelModal.tsx
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx b/apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/ConvertToChannelModal.tsx
similarity index 79%
rename from apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
rename to apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/ConvertToChannelModal.tsx
index f742102cd524c..4517b64471b26 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/ConvertToChannelModal.tsx
@@ -2,9 +2,9 @@ import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import React, { useMemo } from 'react';
 
 import BaseConvertToChannelModal from './BaseConvertToChannelModal';
-import GenericModalSkeleton from '../../../components/GenericModal/GenericModalSkeleton';
-import { useEndpointData } from '../../../hooks/useEndpointData';
-import { AsyncStatePhase } from '../../../lib/asyncState';
+import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
+import { useEndpointData } from '../../../../../hooks/useEndpointData';
+import { AsyncStatePhase } from '../../../../../lib/asyncState';
 
 type ConvertToChannelModalProps = {
 	onClose: () => void;
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx b/apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/ModalSteps/FirstStep.tsx
similarity index 91%
rename from apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
rename to apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/ModalSteps/FirstStep.tsx
index a4aba906e7d92..bc2f3d44d3b7e 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/FirstStep.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/ModalSteps/FirstStep.tsx
@@ -3,8 +3,8 @@ import { Box } from '@rocket.chat/fuselage';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import GenericModal from '../../../../components/GenericModal';
-import ChannelDesertionTable from '../../ChannelDesertionTable';
+import GenericModal from '../../../../../../components/GenericModal';
+import ChannelDesertionTable from '../../../../ChannelDesertionTable';
 
 type FirstStepProps = {
 	onClose: () => void;
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx b/apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/ModalSteps/SecondStep.tsx
similarity index 93%
rename from apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
rename to apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/ModalSteps/SecondStep.tsx
index 27b4a9c7d7723..898a49ca4f5ce 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ModalSteps/SecondStep.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/ModalSteps/SecondStep.tsx
@@ -3,7 +3,7 @@ import { Icon } from '@rocket.chat/fuselage';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import GenericModal from '../../../../components/GenericModal';
+import GenericModal from '../../../../../../components/GenericModal';
 
 type SecondStepsProps = {
 	onClose: () => void;
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/index.ts b/apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/index.ts
similarity index 100%
rename from apps/meteor/client/views/teams/ConvertToChannelModal/index.ts
rename to apps/meteor/client/views/teams/contextualBar/info/ConvertToChannelModal/index.ts
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
index 40f7414d8f32e..ed53c286f631a 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
@@ -1,10 +1,12 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { Box, Button, Callout, Option, Menu } from '@rocket.chat/fuselage';
+import { Box, Button, Callout, IconButton } from '@rocket.chat/fuselage';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import type { ReactElement } from 'react';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useTeamActions } from './useTeamActions';
 import {
 	ContextualbarHeader,
 	ContextualbarIcon,
@@ -25,105 +27,23 @@ import {
 } from '../../../../components/InfoPanel';
 import RetentionPolicyCallout from '../../../../components/InfoPanel/RetentionPolicyCallout';
 import MarkdownText from '../../../../components/MarkdownText';
-import type { Action } from '../../../hooks/useActionSpread';
-import { useActionSpread } from '../../../hooks/useActionSpread';
+import { useSplitRoomActions } from '../../../room/contextualBar/Info/hooks/useSplitRoomActions';
 import { useRetentionPolicy } from '../../../room/hooks/useRetentionPolicy';
 
 type TeamsInfoProps = {
 	room: IRoom;
-	onClickHide?: () => void;
-	onClickClose?: () => void;
-	onClickLeave?: () => void;
 	onClickEdit?: () => void;
-	onClickDelete?: () => void;
+	onClickClose?: () => void;
 	onClickViewChannels: () => void;
-	onClickConvertToChannel?: () => void;
 };
 
-const TeamsInfo = ({
-	room,
-	onClickHide,
-	onClickClose,
-	onClickLeave,
-	onClickEdit,
-	onClickDelete,
-	onClickViewChannels,
-	onClickConvertToChannel,
-}: TeamsInfoProps): ReactElement => {
+const TeamsInfo = ({ room, onClickClose, onClickEdit, onClickViewChannels }: TeamsInfoProps): ReactElement => {
 	const { t } = useTranslation();
 
 	const retentionPolicy = useRetentionPolicy(room);
+	const memoizedActions = useTeamActions(room, { onClickEdit });
 
-	const memoizedActions = useMemo(
-		() => ({
-			...(onClickEdit && {
-				edit: {
-					label: t('Edit'),
-					action: onClickEdit,
-					icon: 'edit' as const,
-				},
-			}),
-			...(onClickDelete && {
-				delete: {
-					label: t('Delete'),
-					action: onClickDelete,
-					icon: 'trash' as const,
-				},
-			}),
-			...(onClickConvertToChannel && {
-				convertToChannel: {
-					label: t('Convert_to_channel'),
-					action: onClickConvertToChannel,
-					icon: 'hash' as const,
-				},
-			}),
-			...(onClickHide && {
-				hide: {
-					label: t('Hide'),
-					action: onClickHide,
-					icon: 'eye-off' as const,
-				},
-			}),
-			...(onClickLeave && {
-				leave: {
-					label: t('Leave'),
-					action: onClickLeave,
-					icon: 'sign-out' as const,
-				},
-			}),
-		}),
-		[t, onClickHide, onClickLeave, onClickEdit, onClickDelete, onClickConvertToChannel],
-	);
-
-	const { actions: actionsDefinition, menu: menuOptions } = useActionSpread(memoizedActions);
-
-	const menu = useMemo(() => {
-		if (!menuOptions) {
-			return null;
-		}
-
-		return (
-			<Menu
-				small={false}
-				flexShrink={0}
-				flexGrow={0}
-				key='menu'
-				maxHeight='initial'
-				title={t('More')}
-				secondary
-				renderItem={({ label: { label, icon }, ...props }): ReactElement => <Option {...props} label={label} icon={icon} />}
-				options={menuOptions}
-			/>
-		);
-	}, [t, menuOptions]);
-
-	const actions = useMemo(() => {
-		const mapAction = ([key, { label, icon, action }]: [string, Action]): ReactElement => (
-			<InfoPanelAction key={key} label={label as string} onClick={action} icon={icon} />
-		);
-
-		return [...actionsDefinition.map(mapAction), menu].filter(Boolean);
-	}, [actionsDefinition, menu]);
+	const { buttons: actions, menu } = useSplitRoomActions(memoizedActions);
 
 	return (
 		<>
@@ -139,7 +59,20 @@ const TeamsInfo = ({
 							<RoomAvatar size='x332' room={room} />
 						</InfoPanelAvatar>
 
-						<InfoPanelActionGroup>{actions}</InfoPanelActionGroup>
+						<InfoPanelActionGroup>
+							{actions.items.map(({ id, content, icon, onClick }) => (
+								<InfoPanelAction key={id} label={content} onClick={onClick} icon={icon} />
+							))}
+							{menu && (
+								<GenericMenu
+									title={t('More')}
+									placement='bottom-end'
+									detached
+									button={<IconButton icon='kebab' secondary flexShrink={0} flexGrow={0} maxHeight='initial' />}
+									sections={menu}
+								/>
+							)}
+						</InfoPanelActionGroup>
 					</InfoPanelSection>
 
 					<InfoPanelSection>
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx
index 4136ebcea61f2..aa6098d319fb4 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx
@@ -1,102 +1,33 @@
-import type { IRoom, Serialized } from '@rocket.chat/core-typings';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useUserId, usePermission, useRouter } from '@rocket.chat/ui-contexts';
-import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { usePermission } from '@rocket.chat/ui-contexts';
+import React, { useCallback, useState } from 'react';
 
-import LeaveTeam from './LeaveTeam';
 import TeamsInfo from './TeamsInfo';
-import { useEndpointAction } from '../../../../hooks/useEndpointAction';
-import { useHideRoomAction } from '../../../../hooks/useHideRoomAction';
-import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom';
 import { useRoom } from '../../../room/contexts/RoomContext';
 import { useRoomToolbox } from '../../../room/contexts/RoomToolboxContext';
-import ConvertToChannelModal from '../../ConvertToChannelModal';
+import EditChannelWithData from '../../../room/contextualBar/Info/EditRoomInfo';
 
-type TeamsInfoWithLogicProps = {
-	openEditing: () => void;
-};
-
-const TeamsInfoWithLogic = ({ openEditing }: TeamsInfoWithLogicProps) => {
+const TeamsInfoWithData = () => {
 	const room = useRoom();
+	const [editing, setEditing] = useState(false);
 	const { openTab, closeTab } = useRoomToolbox();
-	const { t } = useTranslation();
-	const userId = useUserId();
-
-	const dispatchToastMessage = useToastMessageDispatch();
-	const setModal = useSetModal();
-	const closeModal = useMutableCallback(() => setModal());
-
-	const leaveTeam = useEndpointAction('POST', '/v1/teams.leave');
-	const convertTeamToChannel = useEndpointAction('POST', '/v1/teams.convertToChannel');
-
-	const hideTeam = useHideRoomAction({ rid: room._id, type: room.t, name: room.name ?? '' });
-
-	const router = useRouter();
 
 	const canEdit = usePermission('edit-team-channel', room._id);
-
-	// const canLeave = usePermission('leave-team'); /* && room.cl !== false && joined */
-
-	const { handleDelete, canDeleteRoom } = useDeleteRoom(room);
-
-	const onClickLeave = useMutableCallback(() => {
-		const onConfirm = async (selectedRooms: { [key: string]: Serialized<IRoom> & { isLastOwner?: boolean } } = {}) => {
-			const roomsLeft = Object.keys(selectedRooms);
-			const roomsToLeave = Array.isArray(roomsLeft) && roomsLeft.length > 0 ? roomsLeft : [];
-
-			try {
-				await leaveTeam({
-					teamId: room.teamId!,
-					...(roomsToLeave.length && { rooms: roomsToLeave }),
-				});
-				dispatchToastMessage({ type: 'success', message: t('Teams_left_team_successfully') });
-				router.navigate('/home');
-			} catch (error) {
-				dispatchToastMessage({ type: 'error', message: error });
-			} finally {
-				closeModal();
-			}
-		};
-
-		setModal(<LeaveTeam onConfirm={onConfirm} onCancel={closeModal} teamId={room.teamId!} />);
-	});
-
+	const onClickBack = useEffectEvent(() => setEditing(false));
 	const onClickViewChannels = useCallback(() => openTab('team-channels'), [openTab]);
 
-	const onClickConvertToChannel = useMutableCallback(() => {
-		const onConfirm = async (roomsToRemove: { [key: string]: Serialized<IRoom> }) => {
-			try {
-				await convertTeamToChannel({
-					teamId: room.teamId!,
-					roomsToRemove: Object.keys(roomsToRemove),
-				});
-
-				dispatchToastMessage({ type: 'success', message: t('Success') });
-			} catch (error) {
-				dispatchToastMessage({ type: 'error', message: error });
-			} finally {
-				closeModal();
-			}
-		};
-
-		setModal(
-			<ConvertToChannelModal onClose={closeModal} onCancel={closeModal} onConfirm={onConfirm} teamId={room.teamId!} userId={userId!} />,
-		);
-	});
+	if (editing) {
+		return <EditChannelWithData onClickBack={onClickBack} />;
+	}
 
 	return (
 		<TeamsInfo
 			room={room}
-			onClickEdit={canEdit ? openEditing : undefined}
+			onClickEdit={canEdit ? () => setEditing(true) : undefined}
 			onClickClose={closeTab}
-			onClickDelete={canDeleteRoom ? handleDelete : undefined}
-			onClickLeave={onClickLeave}
-			onClickHide={hideTeam}
 			onClickViewChannels={onClickViewChannels}
-			onClickConvertToChannel={canEdit ? onClickConvertToChannel : undefined}
 		/>
 	);
 };
 
-export default TeamsInfoWithLogic;
+export default TeamsInfoWithData;
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithRooms.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithRooms.tsx
deleted file mode 100644
index 6f7b83eb395d9..0000000000000
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithRooms.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import React, { useState } from 'react';
-
-import TeamsInfoWithData from './TeamsInfoWithData';
-import EditChannelWithData from '../../../room/contextualBar/Info/EditRoomInfo';
-
-const TeamsInfoWithRooms = () => {
-	const [editing, setEditing] = useState(false);
-	const onClickBack = useMutableCallback(() => setEditing(false));
-
-	if (editing) {
-		return <EditChannelWithData onClickBack={onClickBack} />;
-	}
-
-	return <TeamsInfoWithData openEditing={() => setEditing(true)} />;
-};
-
-export default TeamsInfoWithRooms;
diff --git a/apps/meteor/client/views/teams/contextualBar/info/useConvertToChannel.tsx b/apps/meteor/client/views/teams/contextualBar/info/useConvertToChannel.tsx
new file mode 100644
index 0000000000000..4822421dc0de8
--- /dev/null
+++ b/apps/meteor/client/views/teams/contextualBar/info/useConvertToChannel.tsx
@@ -0,0 +1,51 @@
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { usePermission, useSetModal, useToastMessageDispatch, useUserId } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import ConvertToChannelModal from './ConvertToChannelModal';
+import { useEndpointAction } from '../../../../hooks/useEndpointAction';
+
+export const useConvertToChannel = ({ _id, teamId }: IRoom) => {
+	const { t } = useTranslation();
+	const setModal = useSetModal();
+	const userId = useUserId();
+	const canEdit = usePermission('edit-team-channel', _id);
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const convertTeamToChannel = useEndpointAction('POST', '/v1/teams.convertToChannel');
+
+	const onClickConvertToChannel = useEffectEvent(() => {
+		if (!userId || !teamId) {
+			throw new Error('Invalid teamId or userId');
+		}
+
+		const onConfirm = async (roomsToRemove: { [key: string]: Serialized<IRoom> }) => {
+			try {
+				await convertTeamToChannel({
+					teamId,
+					roomsToRemove: Object.keys(roomsToRemove),
+				});
+
+				dispatchToastMessage({ type: 'success', message: t('Success') });
+			} catch (error) {
+				dispatchToastMessage({ type: 'error', message: error });
+			} finally {
+				setModal(null);
+			}
+		};
+
+		setModal(
+			<ConvertToChannelModal
+				onClose={() => setModal(null)}
+				onCancel={() => setModal(null)}
+				onConfirm={onConfirm}
+				teamId={teamId}
+				userId={userId}
+			/>,
+		);
+	});
+
+	return canEdit ? onClickConvertToChannel : undefined;
+};
diff --git a/apps/meteor/client/views/teams/contextualBar/info/useLeaveTeam.tsx b/apps/meteor/client/views/teams/contextualBar/info/useLeaveTeam.tsx
new file mode 100644
index 0000000000000..343991c9c1c26
--- /dev/null
+++ b/apps/meteor/client/views/teams/contextualBar/info/useLeaveTeam.tsx
@@ -0,0 +1,46 @@
+import type { IRoom, Serialized } from '@rocket.chat/core-typings';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useRouter, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import LeaveTeam from './LeaveTeam';
+import { useEndpointAction } from '../../../../hooks/useEndpointAction';
+
+export const useLeaveTeam = ({ teamId }: IRoom) => {
+	const { t } = useTranslation();
+	const setModal = useSetModal();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const router = useRouter();
+	const leaveTeam = useEndpointAction('POST', '/v1/teams.leave');
+
+	// const canLeave = usePermission('leave-team'); /* && room.cl !== false && joined */
+	const handleLeaveTeam = useEffectEvent(() => {
+		if (!teamId) {
+			throw new Error('Invalid teamId');
+		}
+
+		const onConfirm = async (selectedRooms: { [key: string]: Serialized<IRoom> & { isLastOwner?: boolean } } = {}) => {
+			const roomsLeft = Object.keys(selectedRooms);
+			const roomsToLeave = Array.isArray(roomsLeft) && roomsLeft.length > 0 ? roomsLeft : [];
+
+			try {
+				await leaveTeam({
+					teamId,
+					...(roomsToLeave.length && { rooms: roomsToLeave }),
+				});
+				dispatchToastMessage({ type: 'success', message: t('Teams_left_team_successfully') });
+				router.navigate('/home');
+			} catch (error) {
+				dispatchToastMessage({ type: 'error', message: error });
+			} finally {
+				setModal(null);
+			}
+		};
+
+		setModal(<LeaveTeam onConfirm={onConfirm} onCancel={() => setModal(null)} teamId={teamId} />);
+	});
+
+	return handleLeaveTeam;
+};
diff --git a/apps/meteor/client/views/teams/contextualBar/info/useTeamActions.ts b/apps/meteor/client/views/teams/contextualBar/info/useTeamActions.ts
new file mode 100644
index 0000000000000..a7a136153587f
--- /dev/null
+++ b/apps/meteor/client/views/teams/contextualBar/info/useTeamActions.ts
@@ -0,0 +1,75 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useConvertToChannel } from './useConvertToChannel';
+import { useLeaveTeam } from './useLeaveTeam';
+import { useHideRoomAction } from '../../../../hooks/useHideRoomAction';
+import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom';
+
+type GenProps = {
+	onClickEdit?: () => void;
+};
+
+export const useTeamActions = (room: IRoom, { onClickEdit }: GenProps) => {
+	const { t } = useTranslation();
+	const hideTeam = useHideRoomAction({ rid: room._id, type: room.t, name: room.name ?? '' });
+	const convertToChannel = useConvertToChannel(room);
+	const { handleDelete, canDeleteRoom } = useDeleteRoom(room);
+	const leaveTeam = useLeaveTeam(room);
+
+	return useMemo(
+		() => ({
+			items: [
+				{
+					id: 'hide',
+					content: t('Hide'),
+					icon: 'eye-off' as const,
+					onClick: hideTeam,
+				},
+				...(onClickEdit
+					? [
+							{
+								id: 'edit',
+								content: t('Edit'),
+								icon: 'edit' as const,
+								onClick: onClickEdit,
+							},
+						]
+					: []),
+				...(leaveTeam
+					? [
+							{
+								id: 'leave',
+								content: t('Leave'),
+								icon: 'sign-out' as const,
+								onClick: leaveTeam,
+							},
+						]
+					: []),
+				...(convertToChannel
+					? [
+							{
+								id: 'convert_team_to_channel',
+								content: t('Convert_to_channel'),
+								icon: 'hash' as const,
+								onClick: convertToChannel,
+							},
+						]
+					: []),
+				...(canDeleteRoom
+					? [
+							{
+								id: 'delete',
+								content: t('Delete'),
+								icon: 'trash' as const,
+								onClick: handleDelete,
+								variant: 'danger',
+							},
+						]
+					: []),
+			],
+		}),
+		[t, hideTeam, leaveTeam, onClickEdit, handleDelete, canDeleteRoom, convertToChannel],
+	);
+};
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
index 61d5ca5945d59..dff205812555f 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
@@ -7,28 +7,20 @@ export class HomeFlextabRoom {
 		this.page = page;
 	}
 
-	get roomInfoTab(): Locator {
-		return this.page.getByRole('dialog', { exact: true });
-	}
-
 	get btnEdit(): Locator {
 		return this.page.locator('role=button[name="Edit"]');
 	}
 
-	get btnMore(): Locator {
-		return this.page.locator('role=button[name="More"]');
-	}
-
 	get btnLeave(): Locator {
-		return this.roomInfoTab.locator('role=button[name="Leave"]');
+		return this.page.locator('role=button[name="Leave"]');
 	}
 
-	get btnDelete(): Locator {
-		return this.roomInfoTab.locator('role=button[name="Delete"]');
+	get btnMore(): Locator {
+		return this.page.locator('role=button[name="More"]');
 	}
 
 	getMoreOption(option: string) {
-		return this.roomInfoTab.locator(`role=menuitem[name="${option}"]`);
+		return this.page.locator(`role=menuitem[name="${option}"]`);
 	}
 
 	get confirmLeaveModal(): Locator {
diff --git a/apps/meteor/tests/e2e/team-management.spec.ts b/apps/meteor/tests/e2e/team-management.spec.ts
index 8f365a84558c8..8883defab7efa 100644
--- a/apps/meteor/tests/e2e/team-management.spec.ts
+++ b/apps/meteor/tests/e2e/team-management.spec.ts
@@ -378,7 +378,8 @@ test.describe.serial('teams-management', () => {
 	test('should delete targetTeamNonPrivate', async () => {
 		await poHomeTeam.sidenav.openChat(targetTeamNonPrivate);
 		await poHomeTeam.tabs.btnRoomInfo.click();
-		await poHomeTeam.tabs.room.btnDelete.click();
+		await poHomeTeam.tabs.room.btnMore.click();
+		await poHomeTeam.tabs.room.getMoreOption('Delete').click();
 		await expect(poHomeTeam.tabs.room.confirmDeleteTeamModal).toBeVisible();
 
 		await poHomeTeam.tabs.room.confirmDeleteTeam();
@@ -406,11 +407,11 @@ test.describe.serial('teams-management', () => {
 		await expect(poHomeTeam.tabs.members.memberOption('user1')).not.toBeVisible();
 	});
 
-	test('should convert team into a channel', async ({ page }) => {
+	test('should convert team into a channel', async () => {
 		await poHomeTeam.sidenav.openChat(targetTeam);
 		await poHomeTeam.tabs.btnRoomInfo.click();
 		await poHomeTeam.tabs.room.btnMore.click();
-		await page.getByRole('listbox', { exact: true }).getByRole('option', { name: 'Convert to Channel' }).click();
+		await poHomeTeam.tabs.room.getMoreOption('Convert to Channel').click();
 		await expect(poHomeTeam.tabs.room.confirmConvertModal).toBeVisible();
 
 		await poHomeTeam.tabs.room.confirmConvert();