diff --git a/apps/meteor/client/components/ResultsLiveRegion.tsx b/apps/meteor/client/components/ResultsLiveRegion.tsx
new file mode 100644
index 0000000000000..2697575b76494
--- /dev/null
+++ b/apps/meteor/client/components/ResultsLiveRegion.tsx
@@ -0,0 +1,14 @@
+import { VisuallyHidden } from 'react-aria';
+import { useTranslation } from 'react-i18next';
+
+const ResultsLiveRegion = ({ shouldAnnounce, itemCount }: { shouldAnnounce: boolean; itemCount: number }) => {
+	const { t } = useTranslation();
+
+	if (itemCount === 0) {
+		return <VisuallyHidden role='status'>{shouldAnnounce && t('No_results_found')}</VisuallyHidden>;
+	}
+
+	return <VisuallyHidden role='status'>{shouldAnnounce && t('__count__result_found', { count: itemCount })}</VisuallyHidden>;
+};
+
+export default ResultsLiveRegion;
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.spec.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.spec.tsx
new file mode 100644
index 0000000000000..95f4b9bb6db3d
--- /dev/null
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.spec.tsx
@@ -0,0 +1,24 @@
+import { composeStories } from '@storybook/react';
+import { render } from '@testing-library/react';
+import { axe } from 'jest-axe';
+
+import * as stories from './DiscussionsList.stories';
+
+jest.mock('../../../../lib/rooms/roomCoordinator', () => ({
+	roomCoordinator: {
+		getRoomDirectives: jest.fn(() => ({})),
+	},
+}));
+
+const testCases = Object.values(composeStories(stories)).map((Story) => [Story.storyName || 'Story', Story]);
+test.each(testCases)(`renders %s without crashing`, async (_storyname, Story) => {
+	const { baseElement } = render(<Story />);
+	expect(baseElement).toMatchSnapshot();
+});
+
+test.each(testCases)('%s should have no a11y violations', async (_storyname, Story) => {
+	const { container } = render(<Story />);
+
+	const results = await axe(container);
+	expect(results).toHaveNoViolations();
+});
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.stories.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.stories.tsx
new file mode 100644
index 0000000000000..df2d0be0d1e01
--- /dev/null
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.stories.tsx
@@ -0,0 +1,55 @@
+import { Contextualbar } from '@rocket.chat/ui-client';
+import { action } from '@storybook/addon-actions';
+import type { Meta, StoryFn } from '@storybook/react';
+
+import DiscussionsList from './DiscussionsList';
+
+export default {
+	component: DiscussionsList,
+	parameters: {
+		layout: 'fullscreen',
+		actions: { argTypesRegex: '^on.*' },
+	},
+	decorators: [(fn) => <Contextualbar height='100vh'>{fn()}</Contextualbar>],
+	args: {
+		text: '',
+		loadMoreItems: action('loadMoreItems'),
+	},
+} satisfies Meta<typeof DiscussionsList>;
+
+const Template: StoryFn<typeof DiscussionsList> = (args) => <DiscussionsList {...args} />;
+
+const fakeDiscussions = Array.from({ length: 10 }, (_, i) => ({
+	_id: String(i),
+	msg: `Discussion ${i}`,
+	ts: new Date('2024-01-01T00:00:00Z'),
+	username: 'user.name',
+	dcount: 5,
+	dlm: new Date('2024-01-01T00:00:00Z'),
+	drid: `drid-${i}`,
+	rid: 'roomId',
+	_updatedAt: new Date('2024-01-01T00:00:00Z'),
+	u: {
+		_id: 'user-id',
+		username: 'user.name',
+	},
+}));
+
+export const Default = Template.bind({});
+Default.args = {
+	isSuccess: true,
+	discussions: fakeDiscussions,
+	itemCount: fakeDiscussions.length,
+};
+
+export const Loading = Template.bind({});
+Loading.args = {
+	isPending: true,
+};
+
+export const Empty = Template.bind({});
+Empty.args = {
+	isSuccess: true,
+	discussions: [],
+	itemCount: 0,
+};
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx
index 0626a532d87c1..a34b4d015d3b9 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx
@@ -14,18 +14,20 @@ import {
 } from '@rocket.chat/ui-client';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, MouseEvent, RefObject } from 'react';
-import { useCallback } from 'react';
+import { useCallback, useId } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import DiscussionsListRow from './DiscussionsListRow';
+import ResultsLiveRegion from '../../../../components/ResultsLiveRegion';
 import { useGoToRoom } from '../../hooks/useGoToRoom';
 
 type DiscussionsListProps = {
-	total: number;
+	itemCount: number;
 	discussions: Array<IDiscussionMessage>;
 	loadMoreItems: (start: number, end: number) => void;
-	loading: boolean;
+	isPending: boolean;
+	isSuccess: boolean;
 	onClose: () => void;
 	error: unknown;
 	text: string;
@@ -33,16 +35,19 @@ type DiscussionsListProps = {
 };
 
 function DiscussionsList({
-	total = 10,
+	itemCount,
 	discussions = [],
 	loadMoreItems,
-	loading,
+	isPending,
+	isSuccess,
 	onClose,
 	error,
 	text,
 	onChangeFilter,
 }: DiscussionsListProps) {
 	const { t } = useTranslation();
+	const discussionListId = useId();
+
 	const showRealNames = useSetting('UI_Use_Real_Name', false);
 	const inputRef = useAutoFocus(true);
 
@@ -70,6 +75,8 @@ function DiscussionsList({
 			<ContextualbarSection>
 				<TextInput
 					placeholder={t('Search_Messages')}
+					aria-label={t('Search_Messages')}
+					aria-controls={isSuccess ? discussionListId : undefined}
 					value={text}
 					onChange={onChangeFilter}
 					ref={inputRef as RefObject<HTMLInputElement>}
@@ -77,37 +84,37 @@ function DiscussionsList({
 				/>
 			</ContextualbarSection>
 			<ContextualbarContent paddingInline={0} ref={ref}>
-				{loading && (
+				<ResultsLiveRegion shouldAnnounce={isSuccess} itemCount={itemCount} />
+				{isPending && (
 					<Box pi={24} pb={12}>
 						<Throbber size='x12' />
 					</Box>
 				)}
-
 				{error instanceof Error && (
 					<Callout mi={24} type='danger'>
 						{error.toString()}
 					</Callout>
 				)}
-
-				{!loading && total === 0 && <ContextualbarEmptyContent title={t('No_Discussions_found')} />}
-
-				<Box flexGrow={1} flexShrink={1} overflow='hidden' display='flex'>
-					{!error && total > 0 && discussions.length > 0 && (
-						<VirtualizedScrollbars>
-							<Virtuoso
-								style={{
-									height: blockSize,
-									width: inlineSize,
-								}}
-								totalCount={total}
-								endReached={loading ? () => undefined : (start) => loadMoreItems(start, Math.min(50, total - start))}
-								overscan={25}
-								data={discussions}
-								itemContent={(_, data) => <DiscussionsListRow discussion={data} showRealNames={showRealNames} onClick={onClick} />}
-							/>
-						</VirtualizedScrollbars>
-					)}
-				</Box>
+				{isSuccess && (
+					<Box id={discussionListId} w='full' h='full' overflow='hidden' flexShrink={1}>
+						{discussions.length === 0 && <ContextualbarEmptyContent title={t('No_Discussions_found')} />}
+						{discussions.length > 0 && (
+							<VirtualizedScrollbars>
+								<Virtuoso
+									style={{
+										height: blockSize,
+										width: inlineSize,
+									}}
+									totalCount={itemCount}
+									endReached={isPending ? () => undefined : (start) => loadMoreItems(start, Math.min(50, itemCount - start))}
+									overscan={25}
+									data={discussions}
+									itemContent={(_, data) => <DiscussionsListRow discussion={data} showRealNames={showRealNames} onClick={onClick} />}
+								/>
+							</VirtualizedScrollbars>
+						)}
+					</Box>
+				)}
 			</ContextualbarContent>
 		</ContextualbarDialog>
 	);
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx
index 76682bbe6b131..23ae4d6081573 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx
@@ -23,10 +23,10 @@ const DiscussionListContextBar = () => {
 		[room._id, debouncedText],
 	);
 
-	const { isPending, error, data, fetchNextPage } = useDiscussionsList(options);
+	const { isPending, isSuccess, error, data, fetchNextPage } = useDiscussionsList(options);
 
 	const discussions = data?.items || [];
-	const totalItemCount = data?.itemCount ?? 0;
+	const itemCount = data?.itemCount ?? 0;
 
 	const handleTextChange = useCallback((e: ChangeEvent<HTMLInputElement>) => {
 		setText(e.currentTarget.value);
@@ -41,8 +41,9 @@ const DiscussionListContextBar = () => {
 			onClose={closeTab}
 			error={error}
 			discussions={discussions}
-			total={totalItemCount}
-			loading={isPending}
+			itemCount={itemCount}
+			isPending={isPending}
+			isSuccess={isSuccess}
 			loadMoreItems={() => fetchNextPage()}
 			text={text}
 			onChangeFilter={handleTextChange}
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/__snapshots__/DiscussionsList.spec.tsx.snap b/apps/meteor/client/views/room/contextualBar/Discussions/__snapshots__/DiscussionsList.spec.tsx.snap
new file mode 100644
index 0000000000000..a8381c4465d03
--- /dev/null
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/__snapshots__/DiscussionsList.spec.tsx.snap
@@ -0,0 +1,478 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`renders Default without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-yefw2m"
+    >
+      <span
+        data-focus-scope-start="true"
+        hidden=""
+      />
+      <div
+        style="position: relative; user-select: auto; width: 380px; height: 100%; max-width: 50%; min-width: 380px; min-height: 100%; box-sizing: border-box; flex-shrink: 0;"
+      >
+        <div
+          aria-labelledby="contextualbarTitle"
+          class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-ohm8rb"
+          role="dialog"
+          tabindex="-1"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-142wtci"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
+            >
+              <i
+                aria-hidden="true"
+                class="rcx-box rcx-box--full rcx-icon--name-discussion rcx-icon rcx-css-1yal9it"
+              >
+                
+              </i>
+              <h5
+                class="rcx-box rcx-box--full rcx-css-1spko5i"
+                id="contextualbarTitle"
+              >
+                Discussions
+              </h5>
+              <button
+                aria-label="Close"
+                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
+                data-qa="ContextualbarActionClose"
+                type="button"
+              >
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-cross rcx-icon rcx-css-4pvxx3"
+                >
+                  
+                </i>
+              </button>
+            </div>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__section rcx-css-16mbly4"
+          >
+            <label
+              class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
+            >
+              <input
+                aria-controls=":r0:"
+                aria-label="Search_Messages"
+                class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
+                placeholder="Search_Messages"
+                size="1"
+                type="text"
+                value=""
+              />
+              <span
+                class="rcx-box rcx-box--full rcx-input-box__addon"
+              >
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-magnifier rcx-icon rcx-css-4pvxx3"
+                >
+                  
+                </i>
+              </span>
+            </label>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-10ikbhr"
+          >
+            <div
+              role="status"
+              style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+            >
+              __count__result_found
+            </div>
+            <div
+              class="rcx-box rcx-box--full rcx-css-4k230l"
+              id=":r0:"
+            >
+              <div
+                class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
+              >
+                <div
+                  data-testid="virtuoso-scroller"
+                  data-virtuoso-scroller="true"
+                  style="height: 1px; outline: none; overflow-y: auto; position: relative; width: 378px;"
+                  tabindex="-1"
+                >
+                  <div
+                    data-viewport-type="element"
+                    style="width: 100%; height: 100%; position: absolute; top: 0px;"
+                  >
+                    <div
+                      data-testid="virtuoso-item-list"
+                      style="box-sizing: border-box; margin-top: 0px; padding-top: 0px; padding-bottom: 0px;"
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; top: -5px; left: 0px; cursor: row-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 10px; height: 100%; top: 0px; cursor: col-resize; right: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; left: 0px; cursor: row-resize; bottom: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 3px; height: 100%; top: 0px; left: 0px; cursor: col-resize; z-index: 99;"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-r98g7d"
+            />
+          </div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; top: -10px; cursor: ne-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; bottom: -10px; cursor: se-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; bottom: -10px; cursor: sw-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; top: -10px; cursor: nw-resize;"
+          />
+        </div>
+      </div>
+      <span
+        data-focus-scope-end="true"
+        hidden=""
+      />
+    </div>
+  </div>
+</body>
+`;
+
+exports[`renders Empty without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-yefw2m"
+    >
+      <span
+        data-focus-scope-start="true"
+        hidden=""
+      />
+      <div
+        style="position: relative; user-select: auto; width: 380px; height: 100%; max-width: 50%; min-width: 380px; min-height: 100%; box-sizing: border-box; flex-shrink: 0;"
+      >
+        <div
+          aria-labelledby="contextualbarTitle"
+          class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-ohm8rb"
+          role="dialog"
+          tabindex="-1"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-142wtci"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
+            >
+              <i
+                aria-hidden="true"
+                class="rcx-box rcx-box--full rcx-icon--name-discussion rcx-icon rcx-css-1yal9it"
+              >
+                
+              </i>
+              <h5
+                class="rcx-box rcx-box--full rcx-css-1spko5i"
+                id="contextualbarTitle"
+              >
+                Discussions
+              </h5>
+              <button
+                aria-label="Close"
+                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
+                data-qa="ContextualbarActionClose"
+                type="button"
+              >
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-cross rcx-icon rcx-css-4pvxx3"
+                >
+                  
+                </i>
+              </button>
+            </div>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__section rcx-css-16mbly4"
+          >
+            <label
+              class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
+            >
+              <input
+                aria-controls=":r2:"
+                aria-label="Search_Messages"
+                class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
+                placeholder="Search_Messages"
+                size="1"
+                type="text"
+                value=""
+              />
+              <span
+                class="rcx-box rcx-box--full rcx-input-box__addon"
+              >
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-magnifier rcx-icon rcx-css-4pvxx3"
+                >
+                  
+                </i>
+              </span>
+            </label>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-10ikbhr"
+          >
+            <div
+              role="status"
+              style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+            >
+              No_results_found
+            </div>
+            <div
+              class="rcx-box rcx-box--full rcx-css-4k230l"
+              id=":r2:"
+            >
+              <div
+                class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-r8c38r"
+              >
+                <div
+                  class="rcx-states"
+                >
+                  <i
+                    aria-hidden="true"
+                    class="rcx-box rcx-box--full rcx-states__icon rcx-icon--name-magnifier rcx-icon rcx-css-d884y5"
+                  >
+                    
+                  </i>
+                  <h3
+                    class="rcx-states__title"
+                  >
+                    No_Discussions_found
+                  </h3>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; top: -5px; left: 0px; cursor: row-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 10px; height: 100%; top: 0px; cursor: col-resize; right: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; left: 0px; cursor: row-resize; bottom: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 3px; height: 100%; top: 0px; left: 0px; cursor: col-resize; z-index: 99;"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-r98g7d"
+            />
+          </div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; top: -10px; cursor: ne-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; bottom: -10px; cursor: se-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; bottom: -10px; cursor: sw-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; top: -10px; cursor: nw-resize;"
+          />
+        </div>
+      </div>
+      <span
+        data-focus-scope-end="true"
+        hidden=""
+      />
+    </div>
+  </div>
+</body>
+`;
+
+exports[`renders Loading without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-yefw2m"
+    >
+      <span
+        data-focus-scope-start="true"
+        hidden=""
+      />
+      <div
+        style="position: relative; user-select: auto; width: 380px; height: 100%; max-width: 50%; min-width: 380px; min-height: 100%; box-sizing: border-box; flex-shrink: 0;"
+      >
+        <div
+          aria-labelledby="contextualbarTitle"
+          class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-ohm8rb"
+          role="dialog"
+          tabindex="-1"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-142wtci"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
+            >
+              <i
+                aria-hidden="true"
+                class="rcx-box rcx-box--full rcx-icon--name-discussion rcx-icon rcx-css-1yal9it"
+              >
+                
+              </i>
+              <h5
+                class="rcx-box rcx-box--full rcx-css-1spko5i"
+                id="contextualbarTitle"
+              >
+                Discussions
+              </h5>
+              <button
+                aria-label="Close"
+                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
+                data-qa="ContextualbarActionClose"
+                type="button"
+              >
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-cross rcx-icon rcx-css-4pvxx3"
+                >
+                  
+                </i>
+              </button>
+            </div>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__section rcx-css-16mbly4"
+          >
+            <label
+              class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
+            >
+              <input
+                aria-label="Search_Messages"
+                class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
+                placeholder="Search_Messages"
+                size="1"
+                type="text"
+                value=""
+              />
+              <span
+                class="rcx-box rcx-box--full rcx-input-box__addon"
+              >
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-magnifier rcx-icon rcx-css-4pvxx3"
+                >
+                  
+                </i>
+              </span>
+            </label>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-10ikbhr"
+          >
+            <div
+              role="status"
+              style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+            />
+            <div
+              class="rcx-box rcx-box--full rcx-css-nyqak3"
+            >
+              <div
+                class="rcx-box rcx-box--full rcx-throbber"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-throbber__circle rcx-css-1xtde58 rcx-css-10wc9to"
+                />
+                <span
+                  class="rcx-box rcx-box--full rcx-throbber__circle rcx-css-1mkyloh rcx-css-10wc9to"
+                />
+                <span
+                  class="rcx-box rcx-box--full rcx-throbber__circle rcx-css-1r9rmv6 rcx-css-10wc9to"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+        <div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; top: -5px; left: 0px; cursor: row-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 10px; height: 100%; top: 0px; cursor: col-resize; right: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; left: 0px; cursor: row-resize; bottom: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 3px; height: 100%; top: 0px; left: 0px; cursor: col-resize; z-index: 99;"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-r98g7d"
+            />
+          </div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; top: -10px; cursor: ne-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; bottom: -10px; cursor: se-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; bottom: -10px; cursor: sw-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; top: -10px; cursor: nw-resize;"
+          />
+        </div>
+      </div>
+      <span
+        data-focus-scope-end="true"
+        hidden=""
+      />
+    </div>
+  </div>
+</body>
+`;
diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
index 3f2978113f889..c804515c61ac7 100644
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
@@ -1,4 +1,5 @@
-import { Callout } from '@rocket.chat/fuselage';
+import { Callout, Box, MessageDivider, Throbber } from '@rocket.chat/fuselage';
+import { MessageTypes } from '@rocket.chat/message-types';
 import {
 	ContextualbarClose,
 	ContextualbarContent,
@@ -7,23 +8,43 @@ import {
 	ContextualbarIcon,
 	ContextualbarSection,
 	ContextualbarDialog,
+	VirtualizedScrollbars,
+	ContextualbarEmptyContent,
 } from '@rocket.chat/ui-client';
-import { useRoomToolbox } from '@rocket.chat/ui-contexts';
-import { useState } from 'react';
+import { useRoomToolbox, useUserPreference, useSetting } from '@rocket.chat/ui-contexts';
+import { useState, memo, Fragment, useId } from 'react';
 import { useTranslation } from 'react-i18next';
+import { Virtuoso } from 'react-virtuoso';
 
-import MessageSearch from './components/MessageSearch';
 import MessageSearchForm from './components/MessageSearchForm';
 import { useMessageSearchProviderQuery } from './hooks/useMessageSearchProviderQuery';
+import { useMessageSearchQuery } from './hooks/useMessageSearchQuery';
+import ResultsLiveRegion from '../../../../components/ResultsLiveRegion';
+import RoomMessage from '../../../../components/message/variants/RoomMessage';
+import SystemMessage from '../../../../components/message/variants/SystemMessage';
+import { useFormatDate } from '../../../../hooks/useFormatDate';
+import MessageListErrorBoundary from '../../MessageList/MessageListErrorBoundary';
+import { isMessageNewDay } from '../../MessageList/lib/isMessageNewDay';
+import MessageListProvider from '../../MessageList/providers/MessageListProvider';
+import { useRoomSubscription } from '../../contexts/RoomContext';
 
+// TODO: Refactor this component to isolate the data from the visual
 const MessageSearchTab = () => {
-	const providerQuery = useMessageSearchProviderQuery();
-
+	const { t } = useTranslation();
+	const searchListId = useId();
+	const formatDate = useFormatDate();
 	const { closeTab } = useRoomToolbox();
+	const pageSize = useSetting('PageSize', 10);
 
-	const [{ searchText, globalSearch }, handleSearch] = useState({ searchText: '', globalSearch: false });
+	const [limit, setLimit] = useState(pageSize);
+	const subscription = useRoomSubscription();
+	const showUserAvatar = !!useUserPreference<boolean>('displayAvatars');
 
-	const { t } = useTranslation();
+	const providerQuery = useMessageSearchProviderQuery();
+
+	const [{ searchText, globalSearch }, handleSearch] = useState({ searchText: '', globalSearch: false });
+	const { isSuccess, data: messageSearchData, isPending } = useMessageSearchQuery({ searchText, limit, globalSearch });
+	const itemCount = messageSearchData?.length ?? 0;
 
 	return (
 		<ContextualbarDialog>
@@ -34,11 +55,71 @@ const MessageSearchTab = () => {
 			</ContextualbarHeader>
 			{providerQuery.data && (
 				<ContextualbarSection>
-					<MessageSearchForm provider={providerQuery.data} onSearch={handleSearch} />
+					<MessageSearchForm provider={providerQuery.data} onSearch={handleSearch} searchListId={searchListId} isSuccess={isSuccess} />
 				</ContextualbarSection>
 			)}
 			<ContextualbarContent flexShrink={1} flexGrow={1} paddingInline={0}>
-				{providerQuery.isSuccess && <MessageSearch searchText={searchText} globalSearch={globalSearch} />}
+				<ResultsLiveRegion shouldAnnounce={isSuccess} itemCount={itemCount} />
+				{providerQuery.isSuccess && (
+					<>
+						{searchText && isPending && <Throbber />}
+						{isSuccess && (
+							<Box id={searchListId} display='flex' flexDirection='column' flexGrow={1} flexShrink={1} flexBasis={0}>
+								{messageSearchData.length === 0 && <ContextualbarEmptyContent title={t('No_results_found')} />}
+								{messageSearchData.length > 0 && (
+									<MessageListErrorBoundary>
+										<MessageListProvider>
+											<Box is='section' display='flex' flexDirection='column' flexGrow={1} flexShrink={1} flexBasis='auto' height='full'>
+												<VirtualizedScrollbars>
+													<Virtuoso
+														totalCount={messageSearchData.length}
+														overscan={25}
+														data={messageSearchData}
+														itemContent={(index, message) => {
+															const previous = messageSearchData[index - 1];
+
+															const newDay = isMessageNewDay(message, previous);
+
+															const system = MessageTypes.isSystemMessage(message);
+
+															const unread = subscription?.tunread?.includes(message._id) ?? false;
+															const mention = subscription?.tunreadUser?.includes(message._id) ?? false;
+															const all = subscription?.tunreadGroup?.includes(message._id) ?? false;
+
+															return (
+																<Fragment key={message._id}>
+																	{newDay && <MessageDivider>{formatDate(message.ts)}</MessageDivider>}
+
+																	{system ? (
+																		<SystemMessage message={message} showUserAvatar={showUserAvatar} />
+																	) : (
+																		<RoomMessage
+																			message={message}
+																			sequential={false}
+																			unread={unread}
+																			mention={mention}
+																			all={all}
+																			context='search'
+																			searchText={searchText}
+																			showUserAvatar={showUserAvatar}
+																		/>
+																	)}
+																</Fragment>
+															);
+														}}
+														endReached={() => {
+															setLimit((limit) => limit + pageSize);
+														}}
+													/>
+												</VirtualizedScrollbars>
+											</Box>
+										</MessageListProvider>
+									</MessageListErrorBoundary>
+								)}
+							</Box>
+						)}
+					</>
+				)}
 				{providerQuery.isError && (
 					<Callout m={24} type='danger'>
 						{t('Search_current_provider_not_active')}
@@ -49,4 +130,4 @@ const MessageSearchTab = () => {
 	);
 };
 
-export default MessageSearchTab;
+export default memo(MessageSearchTab);
diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearch.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearch.tsx
deleted file mode 100644
index d1c9d787560c1..0000000000000
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearch.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { Box, MessageDivider } from '@rocket.chat/fuselage';
-import { MessageTypes } from '@rocket.chat/message-types';
-import { VirtualizedScrollbars, ContextualbarEmptyContent } from '@rocket.chat/ui-client';
-import { useSetting, useTranslation, useUserPreference } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
-import { Fragment, memo, useState } from 'react';
-import { Virtuoso } from 'react-virtuoso';
-
-import RoomMessage from '../../../../../components/message/variants/RoomMessage';
-import SystemMessage from '../../../../../components/message/variants/SystemMessage';
-import { useFormatDate } from '../../../../../hooks/useFormatDate';
-import MessageListErrorBoundary from '../../../MessageList/MessageListErrorBoundary';
-import { isMessageNewDay } from '../../../MessageList/lib/isMessageNewDay';
-import MessageListProvider from '../../../MessageList/providers/MessageListProvider';
-import LoadingMessagesIndicator from '../../../body/LoadingMessagesIndicator';
-import { useRoomSubscription } from '../../../contexts/RoomContext';
-import { useMessageSearchQuery } from '../hooks/useMessageSearchQuery';
-
-type MessageSearchProps = {
-	searchText: string;
-	globalSearch: boolean;
-};
-
-const MessageSearch = ({ searchText, globalSearch }: MessageSearchProps): ReactElement => {
-	const t = useTranslation();
-	const formatDate = useFormatDate();
-	const pageSize = useSetting('PageSize', 10);
-	const [limit, setLimit] = useState(pageSize);
-	const showUserAvatar = !!useUserPreference<boolean>('displayAvatars');
-
-	const subscription = useRoomSubscription();
-	const messageSearchQuery = useMessageSearchQuery({ searchText, limit, globalSearch });
-
-	return (
-		<Box display='flex' flexDirection='column' flexGrow={1} flexShrink={1} flexBasis={0}>
-			{messageSearchQuery.data && (
-				<>
-					{messageSearchQuery.data.length === 0 && <ContextualbarEmptyContent title={t('No_results_found')} />}
-					{messageSearchQuery.data.length > 0 && (
-						<MessageListErrorBoundary>
-							<MessageListProvider>
-								<Box is='section' display='flex' flexDirection='column' flexGrow={1} flexShrink={1} flexBasis='auto' height='full'>
-									<VirtualizedScrollbars>
-										<Virtuoso
-											totalCount={messageSearchQuery.data.length}
-											overscan={25}
-											data={messageSearchQuery.data}
-											itemContent={(index, message) => {
-												const previous = messageSearchQuery.data[index - 1];
-
-												const newDay = isMessageNewDay(message, previous);
-
-												const system = MessageTypes.isSystemMessage(message);
-
-												const unread = subscription?.tunread?.includes(message._id) ?? false;
-												const mention = subscription?.tunreadUser?.includes(message._id) ?? false;
-												const all = subscription?.tunreadGroup?.includes(message._id) ?? false;
-
-												return (
-													<Fragment key={message._id}>
-														{newDay && <MessageDivider>{formatDate(message.ts)}</MessageDivider>}
-
-														{system ? (
-															<SystemMessage message={message} showUserAvatar={showUserAvatar} />
-														) : (
-															<RoomMessage
-																message={message}
-																sequential={false}
-																unread={unread}
-																mention={mention}
-																all={all}
-																context='search'
-																searchText={searchText}
-																showUserAvatar={showUserAvatar}
-															/>
-														)}
-													</Fragment>
-												);
-											}}
-											endReached={() => {
-												setLimit((limit) => limit + pageSize);
-											}}
-										/>
-									</VirtualizedScrollbars>
-								</Box>
-							</MessageListProvider>
-						</MessageListErrorBoundary>
-					)}
-				</>
-			)}
-			{searchText && messageSearchQuery.isLoading && <LoadingMessagesIndicator />}
-		</Box>
-	);
-};
-
-export default memo(MessageSearch);
diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
index f807ec4411a5c..c7bf80efcd7a8 100644
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
@@ -13,9 +13,11 @@ import { useRoom } from '../../../contexts/RoomContext';
 type MessageSearchFormProps = {
 	provider: IMessageSearchProvider;
 	onSearch: (params: { searchText: string; globalSearch: boolean }) => void;
+	searchListId: string;
+	isSuccess: boolean;
 };
 
-const MessageSearchForm = ({ provider, onSearch }: MessageSearchFormProps) => {
+const MessageSearchForm = ({ provider, onSearch, searchListId, isSuccess }: MessageSearchFormProps) => {
 	const { handleSubmit, register, setFocus, control } = useForm({
 		defaultValues: {
 			searchText: '',
@@ -55,6 +57,7 @@ const MessageSearchForm = ({ provider, onSearch }: MessageSearchFormProps) => {
 					addon={<Icon name='magnifier' size='x20' />}
 					placeholder={t('Search_Messages')}
 					aria-label={t('Search_Messages')}
+					aria-controls={isSuccess ? searchListId : undefined}
 					autoComplete='off'
 					{...register('searchText')}
 				/>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.spec.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.spec.tsx
new file mode 100644
index 0000000000000..969d54ca792f9
--- /dev/null
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.spec.tsx
@@ -0,0 +1,23 @@
+import { composeStories } from '@storybook/react';
+import { render } from '@testing-library/react';
+import { axe } from 'jest-axe';
+
+import * as stories from './RoomFiles.stories';
+
+jest.mock('../../../../../app/utils/client', () => ({
+	getURL: jest.fn((url: string) => url),
+}));
+
+const testCases = Object.values(composeStories(stories)).map((Story) => [Story.storyName || 'Story', Story]);
+test.each(testCases)(`renders %s without crashing`, async (_storyname, Story) => {
+	const { baseElement } = render(<Story />);
+	expect(baseElement).toMatchSnapshot();
+});
+
+test.each(testCases)('%s should have no a11y violations', async (_storyname, Story) => {
+	const { container } = render(<Story />);
+
+	// Disable 'nested-interactive' rule because our `Select` component is still not a11y compliant
+	const results = await axe(container, { rules: { 'nested-interactive': { enabled: false } } });
+	expect(results).toHaveNoViolations();
+});
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx
index bae5571abf330..ea11df526c995 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx
@@ -11,50 +11,43 @@ export default {
 		actions: { argTypesRegex: '^on.*' },
 	},
 	decorators: [(fn) => <Contextualbar height='100vh'>{fn()}</Contextualbar>],
+	args: {
+		type: 'all',
+		text: '',
+		loadMoreItems: action('loadMoreItems'),
+		setText: action('setText'),
+		setType: action('setType'),
+	},
 } satisfies Meta<typeof RoomFiles>;
 
 const Template: StoryFn<typeof RoomFiles> = (args) => <RoomFiles {...args} />;
 
+const fakeItems = Array.from({ length: 10 }, (_, i) => ({
+	_id: String(i),
+	name: `File ${i}`,
+	url: '#',
+	uploadedAt: new Date(),
+	user: {
+		_id: 'rocket.cat',
+		username: 'rocket.cat',
+	},
+}));
+
 export const Default = Template.bind({});
 Default.args = {
-	filesItems: [
-		{
-			_id: '1',
-			name: 'Lorem Ipsum Indolor Dolor',
-			url: '#',
-			uploadedAt: new Date(),
-			user: {
-				_id: 'rocket.cat',
-				username: 'rocket.cat',
-			},
-		},
-		{
-			_id: '2',
-			name: 'Lorem Ipsum Indolor Dolor',
-			url: '#',
-			uploadedAt: new Date(),
-			user: {
-				_id: 'rocket.cat',
-				username: 'rocket.cat',
-			},
-		},
-	],
-	text: 'Ipsum',
-	type: 'text',
-	setText: action('setText'),
-	setType: action('setType'),
-	total: 2,
-	loadMoreItems: action('loadMoreItems'),
+	filesItems: fakeItems,
+	total: fakeItems.length,
+	isSuccess: true,
 };
 
 export const Loading = Template.bind({});
 Loading.args = {
-	loading: true,
+	isPending: true,
 };
 
 export const Empty = Template.bind({});
 Empty.args = {
-	setText: action('setText'),
-	setType: action('setType'),
-	loadMoreItems: action('loadMoreItems'),
+	isSuccess: true,
+	filesItems: [],
+	total: 0,
 };
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
index 77d60c0b0a2e4..a3f65f86432a2 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
@@ -1,4 +1,4 @@
-import type { IUpload, IUploadWithUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUpload, IUploadWithUser } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Icon, TextInput, Select, Throbber, ContextualbarSection } from '@rocket.chat/fuselage';
 import {
@@ -12,16 +12,19 @@ import {
 	ContextualbarDialog,
 } from '@rocket.chat/ui-client';
 import type { ChangeEvent } from 'react';
-import { useMemo } from 'react';
+import { useId, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
 import RoomFileItemWrapper from './RoomFileItemWrapper';
 import RoomFilesListWrapper from './RoomFilesListWrapper';
 import FileItem from './components/FileItem';
+import ResultsLiveRegion from '../../../../components/ResultsLiveRegion';
 
 type RoomFilesProps = {
-	loading: boolean;
+	rid: IRoom['_id'];
+	isPending: boolean;
+	isSuccess: boolean;
 	type: string;
 	text: string;
 	filesItems: IUploadWithUser[];
@@ -34,7 +37,9 @@ type RoomFilesProps = {
 };
 
 const RoomFiles = ({
-	loading,
+	rid,
+	isPending,
+	isSuccess,
 	type,
 	text,
 	filesItems = [],
@@ -46,6 +51,7 @@ const RoomFiles = ({
 	onClickDelete,
 }: RoomFilesProps) => {
 	const { t } = useTranslation();
+	const filesListId = useId();
 
 	const options: SelectOption[] = useMemo(
 		() => [
@@ -70,40 +76,45 @@ const RoomFiles = ({
 				<TextInput
 					data-qa-files-search
 					placeholder={t('Search_Files')}
+					aria-label={t('Search_Files')}
+					aria-controls={isSuccess ? filesListId : undefined}
 					value={text}
 					onChange={setText}
 					addon={<Icon name='magnifier' size='x20' />}
 				/>
 				<Box w='x144' mis={8}>
-					<Select onChange={setType} value={type} options={options} />
+					<Select aria-controls={isSuccess ? filesListId : undefined} onChange={setType} value={type} options={options} />
 				</Box>
 			</ContextualbarSection>
 			<ContextualbarContent paddingInline={0}>
-				{loading && (
+				<ResultsLiveRegion shouldAnnounce={isSuccess} itemCount={total} />
+				{isPending && (
 					<Box p={24}>
 						<Throbber size='x12' />
 					</Box>
 				)}
-				{!loading && filesItems.length === 0 && <ContextualbarEmptyContent title={t('No_files_found')} />}
-				{!loading && filesItems.length > 0 && (
-					<Box w='full' h='full' flexShrink={1} overflow='hidden'>
-						<VirtualizedScrollbars>
-							<Virtuoso
-								style={{
-									height: '100%',
-									width: '100%',
-								}}
-								totalCount={total}
-								endReached={loadMoreItems}
-								overscan={100}
-								data={filesItems}
-								itemContent={(_, data) => <FileItem fileData={data} onClickDelete={onClickDelete} />}
-								components={{
-									List: RoomFilesListWrapper,
-									Item: RoomFileItemWrapper,
-								}}
-							/>
-						</VirtualizedScrollbars>
+				{isSuccess && (
+					<Box w='full' h='full' id={filesListId} flexShrink={1} overflow='hidden'>
+						{filesItems.length === 0 && <ContextualbarEmptyContent title={t('No_files_found')} />}
+						{filesItems.length > 0 && (
+							<VirtualizedScrollbars>
+								<Virtuoso
+									style={{
+										height: '100%',
+										width: '100%',
+									}}
+									totalCount={total}
+									endReached={loadMoreItems}
+									overscan={100}
+									data={filesItems}
+									itemContent={(_, data) => <FileItem rid={rid} fileData={data} onClickDelete={onClickDelete} />}
+									components={{
+										List: RoomFilesListWrapper,
+										Item: RoomFileItemWrapper,
+									}}
+								/>
+							</VirtualizedScrollbars>
+						)}
 					</Box>
 				)}
 			</ContextualbarContent>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx
index 93888db5e5c5c..cd7df321c7a1b 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx
@@ -16,7 +16,7 @@ const RoomFilesWithData = () => {
 
 	const debouncedText = useDebouncedValue(text, 400);
 
-	const { isPending, data, fetchNextPage, refetch } = useFilesList({
+	const { isPending, isSuccess, data, fetchNextPage, refetch } = useFilesList({
 		rid: room._id,
 		type,
 		text: debouncedText,
@@ -30,7 +30,9 @@ const RoomFilesWithData = () => {
 
 	return (
 		<RoomFiles
-			loading={isPending}
+			rid={room._id}
+			isPending={isPending}
+			isSuccess={isSuccess}
 			type={type}
 			text={text}
 			filesItems={data?.filesItems ?? []}
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/__snapshots__/RoomFiles.spec.tsx.snap b/apps/meteor/client/views/room/contextualBar/RoomFiles/__snapshots__/RoomFiles.spec.tsx.snap
new file mode 100644
index 0000000000000..6587b1ab9de66
--- /dev/null
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/__snapshots__/RoomFiles.spec.tsx.snap
@@ -0,0 +1,651 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`renders Default without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-yefw2m"
+    >
+      <span
+        data-focus-scope-start="true"
+        hidden=""
+      />
+      <div
+        style="position: relative; user-select: auto; width: 380px; height: 100%; max-width: 50%; min-width: 380px; min-height: 100%; box-sizing: border-box; flex-shrink: 0;"
+      >
+        <div
+          aria-labelledby="contextualbarTitle"
+          class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-ohm8rb"
+          role="dialog"
+          tabindex="-1"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-142wtci"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
+            >
+              <i
+                aria-hidden="true"
+                class="rcx-box rcx-box--full rcx-icon--name-attachment rcx-icon rcx-css-1yal9it"
+              >
+                
+              </i>
+              <h5
+                class="rcx-box rcx-box--full rcx-css-1spko5i"
+                id="contextualbarTitle"
+              >
+                Files
+              </h5>
+            </div>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__section rcx-css-137qgp8"
+          >
+            <label
+              class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
+            >
+              <input
+                aria-controls=":r0:"
+                aria-label="Search_Files"
+                class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
+                data-qa-files-search="true"
+                placeholder="Search_Files"
+                size="1"
+                type="text"
+                value=""
+              />
+              <span
+                class="rcx-box rcx-box--full rcx-input-box__addon"
+              >
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-magnifier rcx-icon rcx-css-4pvxx3"
+                >
+                  
+                </i>
+              </span>
+            </label>
+            <div
+              class="rcx-box rcx-box--full rcx-css-l1qvi5"
+            >
+              <button
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-labelledby="react-aria-:r9:"
+                class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
+                type="button"
+              >
+                <div
+                  aria-hidden="true"
+                  data-a11y-ignore="aria-hidden-focus"
+                  data-react-aria-prevent-focus="true"
+                  data-testid="hidden-select-container"
+                  style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+                >
+                  <label>
+                    <select
+                      tabindex="-1"
+                    >
+                      <option />
+                      <option
+                        value="all"
+                      >
+                        all
+                      </option>
+                      <option
+                        value="image"
+                      >
+                        image
+                      </option>
+                      <option
+                        value="video"
+                      >
+                        video
+                      </option>
+                      <option
+                        value="audio"
+                      >
+                        audio
+                      </option>
+                      <option
+                        value="text"
+                      >
+                        text
+                      </option>
+                      <option
+                        value="application"
+                      >
+                        application
+                      </option>
+                    </select>
+                  </label>
+                </div>
+                <span
+                  class="rcx-box rcx-box--full rcx-css-e3nij6"
+                  id="react-aria-:r9:"
+                >
+                  All
+                </span>
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-chevron-down rcx-icon rcx-css-1wz6xj9"
+                >
+                  
+                </i>
+              </button>
+            </div>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-10ikbhr"
+          >
+            <div
+              role="status"
+              style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+            >
+              __count__result_found
+            </div>
+            <div
+              class="rcx-box rcx-box--full rcx-css-kotrsu"
+              id=":r0:"
+            >
+              <div
+                class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
+              >
+                <div
+                  data-testid="virtuoso-scroller"
+                  data-virtuoso-scroller="true"
+                  style="height: 100%; outline: none; overflow-y: auto; position: relative; width: 100%;"
+                  tabindex="-1"
+                >
+                  <div
+                    data-viewport-type="element"
+                    style="width: 100%; height: 100%; position: absolute; top: 0px;"
+                  >
+                    <div
+                      aria-label="Files_list"
+                      data-testid="virtuoso-item-list"
+                      role="list"
+                      style="box-sizing: border-box; margin-top: 0px; padding-top: 0px; padding-bottom: 0px;"
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; top: -5px; left: 0px; cursor: row-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 10px; height: 100%; top: 0px; cursor: col-resize; right: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; left: 0px; cursor: row-resize; bottom: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 3px; height: 100%; top: 0px; left: 0px; cursor: col-resize; z-index: 99;"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-r98g7d"
+            />
+          </div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; top: -10px; cursor: ne-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; bottom: -10px; cursor: se-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; bottom: -10px; cursor: sw-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; top: -10px; cursor: nw-resize;"
+          />
+        </div>
+      </div>
+      <span
+        data-focus-scope-end="true"
+        hidden=""
+      />
+    </div>
+  </div>
+</body>
+`;
+
+exports[`renders Empty without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-yefw2m"
+    >
+      <span
+        data-focus-scope-start="true"
+        hidden=""
+      />
+      <div
+        style="position: relative; user-select: auto; width: 380px; height: 100%; max-width: 50%; min-width: 380px; min-height: 100%; box-sizing: border-box; flex-shrink: 0;"
+      >
+        <div
+          aria-labelledby="contextualbarTitle"
+          class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-ohm8rb"
+          role="dialog"
+          tabindex="-1"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-142wtci"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
+            >
+              <i
+                aria-hidden="true"
+                class="rcx-box rcx-box--full rcx-icon--name-attachment rcx-icon rcx-css-1yal9it"
+              >
+                
+              </i>
+              <h5
+                class="rcx-box rcx-box--full rcx-css-1spko5i"
+                id="contextualbarTitle"
+              >
+                Files
+              </h5>
+            </div>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__section rcx-css-137qgp8"
+          >
+            <label
+              class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
+            >
+              <input
+                aria-controls=":ra:"
+                aria-label="Search_Files"
+                class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
+                data-qa-files-search="true"
+                placeholder="Search_Files"
+                size="1"
+                type="text"
+                value=""
+              />
+              <span
+                class="rcx-box rcx-box--full rcx-input-box__addon"
+              >
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-magnifier rcx-icon rcx-css-4pvxx3"
+                >
+                  
+                </i>
+              </span>
+            </label>
+            <div
+              class="rcx-box rcx-box--full rcx-css-l1qvi5"
+            >
+              <button
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-labelledby="react-aria-:rj:"
+                class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
+                type="button"
+              >
+                <div
+                  aria-hidden="true"
+                  data-a11y-ignore="aria-hidden-focus"
+                  data-react-aria-prevent-focus="true"
+                  data-testid="hidden-select-container"
+                  style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+                >
+                  <label>
+                    <select
+                      tabindex="-1"
+                    >
+                      <option />
+                      <option
+                        value="all"
+                      >
+                        all
+                      </option>
+                      <option
+                        value="image"
+                      >
+                        image
+                      </option>
+                      <option
+                        value="video"
+                      >
+                        video
+                      </option>
+                      <option
+                        value="audio"
+                      >
+                        audio
+                      </option>
+                      <option
+                        value="text"
+                      >
+                        text
+                      </option>
+                      <option
+                        value="application"
+                      >
+                        application
+                      </option>
+                    </select>
+                  </label>
+                </div>
+                <span
+                  class="rcx-box rcx-box--full rcx-css-e3nij6"
+                  id="react-aria-:rj:"
+                >
+                  All
+                </span>
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-chevron-down rcx-icon rcx-css-1wz6xj9"
+                >
+                  
+                </i>
+              </button>
+            </div>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-10ikbhr"
+          >
+            <div
+              role="status"
+              style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+            >
+              No_results_found
+            </div>
+            <div
+              class="rcx-box rcx-box--full rcx-css-kotrsu"
+              id=":ra:"
+            >
+              <div
+                class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-r8c38r"
+              >
+                <div
+                  class="rcx-states"
+                >
+                  <i
+                    aria-hidden="true"
+                    class="rcx-box rcx-box--full rcx-states__icon rcx-icon--name-magnifier rcx-icon rcx-css-d884y5"
+                  >
+                    
+                  </i>
+                  <h3
+                    class="rcx-states__title"
+                  >
+                    No_files_found
+                  </h3>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; top: -5px; left: 0px; cursor: row-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 10px; height: 100%; top: 0px; cursor: col-resize; right: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; left: 0px; cursor: row-resize; bottom: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 3px; height: 100%; top: 0px; left: 0px; cursor: col-resize; z-index: 99;"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-r98g7d"
+            />
+          </div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; top: -10px; cursor: ne-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; bottom: -10px; cursor: se-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; bottom: -10px; cursor: sw-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; top: -10px; cursor: nw-resize;"
+          />
+        </div>
+      </div>
+      <span
+        data-focus-scope-end="true"
+        hidden=""
+      />
+    </div>
+  </div>
+</body>
+`;
+
+exports[`renders Loading without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-yefw2m"
+    >
+      <span
+        data-focus-scope-start="true"
+        hidden=""
+      />
+      <div
+        style="position: relative; user-select: auto; width: 380px; height: 100%; max-width: 50%; min-width: 380px; min-height: 100%; box-sizing: border-box; flex-shrink: 0;"
+      >
+        <div
+          aria-labelledby="contextualbarTitle"
+          class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-ohm8rb"
+          role="dialog"
+          tabindex="-1"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-142wtci"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
+            >
+              <i
+                aria-hidden="true"
+                class="rcx-box rcx-box--full rcx-icon--name-attachment rcx-icon rcx-css-1yal9it"
+              >
+                
+              </i>
+              <h5
+                class="rcx-box rcx-box--full rcx-css-1spko5i"
+                id="contextualbarTitle"
+              >
+                Files
+              </h5>
+            </div>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__section rcx-css-137qgp8"
+          >
+            <label
+              class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
+            >
+              <input
+                aria-label="Search_Files"
+                class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
+                data-qa-files-search="true"
+                placeholder="Search_Files"
+                size="1"
+                type="text"
+                value=""
+              />
+              <span
+                class="rcx-box rcx-box--full rcx-input-box__addon"
+              >
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-magnifier rcx-icon rcx-css-4pvxx3"
+                >
+                  
+                </i>
+              </span>
+            </label>
+            <div
+              class="rcx-box rcx-box--full rcx-css-l1qvi5"
+            >
+              <button
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-labelledby="react-aria-:rt:"
+                class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
+                type="button"
+              >
+                <div
+                  aria-hidden="true"
+                  data-a11y-ignore="aria-hidden-focus"
+                  data-react-aria-prevent-focus="true"
+                  data-testid="hidden-select-container"
+                  style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+                >
+                  <label>
+                    <select
+                      tabindex="-1"
+                    >
+                      <option />
+                      <option
+                        value="all"
+                      >
+                        all
+                      </option>
+                      <option
+                        value="image"
+                      >
+                        image
+                      </option>
+                      <option
+                        value="video"
+                      >
+                        video
+                      </option>
+                      <option
+                        value="audio"
+                      >
+                        audio
+                      </option>
+                      <option
+                        value="text"
+                      >
+                        text
+                      </option>
+                      <option
+                        value="application"
+                      >
+                        application
+                      </option>
+                    </select>
+                  </label>
+                </div>
+                <span
+                  class="rcx-box rcx-box--full rcx-css-e3nij6"
+                  id="react-aria-:rt:"
+                >
+                  All
+                </span>
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-chevron-down rcx-icon rcx-css-1wz6xj9"
+                >
+                  
+                </i>
+              </button>
+            </div>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-10ikbhr"
+          >
+            <div
+              role="status"
+              style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+            />
+            <div
+              class="rcx-box rcx-box--full rcx-css-m843eh"
+            >
+              <div
+                class="rcx-box rcx-box--full rcx-throbber"
+              >
+                <span
+                  class="rcx-box rcx-box--full rcx-throbber__circle rcx-css-1xtde58 rcx-css-10wc9to"
+                />
+                <span
+                  class="rcx-box rcx-box--full rcx-throbber__circle rcx-css-1mkyloh rcx-css-10wc9to"
+                />
+                <span
+                  class="rcx-box rcx-box--full rcx-throbber__circle rcx-css-1r9rmv6 rcx-css-10wc9to"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+        <div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; top: -5px; left: 0px; cursor: row-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 10px; height: 100%; top: 0px; cursor: col-resize; right: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; left: 0px; cursor: row-resize; bottom: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 3px; height: 100%; top: 0px; left: 0px; cursor: col-resize; z-index: 99;"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-r98g7d"
+            />
+          </div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; top: -10px; cursor: ne-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; bottom: -10px; cursor: se-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; bottom: -10px; cursor: sw-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; top: -10px; cursor: nw-resize;"
+          />
+        </div>
+      </div>
+      <span
+        data-focus-scope-end="true"
+        hidden=""
+      />
+    </div>
+  </div>
+</body>
+`;
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx
index b58696393cb3f..f324402325525 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx
@@ -1,4 +1,4 @@
-import type { IUpload, IUploadWithUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUpload, IUploadWithUser } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 
 import FileItemIcon from './FileItemIcon';
@@ -9,11 +9,12 @@ import { useDownloadFromServiceWorker } from '../../../../../hooks/useDownloadFr
 import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 
 type FileItemProps = {
+	rid: IRoom['_id'];
 	fileData: IUploadWithUser;
 	onClickDelete: (id: IUpload['_id']) => void;
 };
 
-const FileItem = ({ fileData, onClickDelete }: FileItemProps) => {
+const FileItem = ({ rid, fileData, onClickDelete }: FileItemProps) => {
 	const format = useFormatDateAndTime();
 	const { _id, path, name, uploadedAt, type, typeGroup, user } = fileData;
 
@@ -57,7 +58,7 @@ const FileItem = ({ fileData, onClickDelete }: FileItemProps) => {
 					</Box>
 				</Box>
 			)}
-			<FileItemMenu fileData={fileData} onClickDelete={onClickDelete} />
+			<FileItemMenu rid={rid} fileData={fileData} onClickDelete={onClickDelete} />
 		</>
 	);
 };
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx
index edde3dd71c98b..d657e8f02750d 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx
@@ -1,4 +1,4 @@
-import type { IUpload } from '@rocket.chat/core-typings';
+import type { IRoom, IUpload } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { Box } from '@rocket.chat/fuselage';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
@@ -8,10 +8,10 @@ import { memo, useEffect, useId } from 'react';
 
 import { getURL } from '../../../../../../app/utils/client';
 import { download, downloadAs } from '../../../../../lib/download';
-import { useRoom } from '../../../contexts/RoomContext';
 import { useMessageDeletionIsAllowed } from '../hooks/useMessageDeletionIsAllowed';
 
 type FileItemMenuProps = {
+	rid: IRoom['_id'];
 	fileData: IUpload;
 	onClickDelete: (id: IUpload['_id']) => void;
 };
@@ -28,11 +28,10 @@ if ('serviceWorker' in navigator) {
 	});
 }
 
-const FileItemMenu = ({ fileData, onClickDelete }: FileItemMenuProps) => {
+const FileItemMenu = ({ rid, fileData, onClickDelete }: FileItemMenuProps) => {
 	const t = useTranslation();
-	const room = useRoom();
 	const userId = useUserId();
-	const isDeletionAllowed = useMessageDeletionIsAllowed(room._id, fileData, userId);
+	const isDeletionAllowed = useMessageDeletionIsAllowed(rid, fileData, userId);
 	const canDownloadFile = !fileData.encryption || 'serviceWorker' in navigator;
 
 	const { controller } = navigator?.serviceWorker || {};
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx
index e396ec819b4ff..f41b215493693 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx
@@ -12,13 +12,24 @@ export default {
 		actions: { argTypesRegex: '^on.*' },
 	},
 	decorators: [(fn) => <Contextualbar height='100vh'>{fn()}</Contextualbar>],
+	args: {
+		text: 'filter',
+		type: 'online',
+		setText: action('setText'),
+		setType: action('setType'),
+		loadMoreItems: action('loadMoreItems'),
+		reload: action('reload'),
+		rid: 'GENERAL',
+		isTeam: false,
+		isDirect: false,
+	},
 } satisfies Meta<typeof RoomMembers>;
 
 const Template: StoryFn<typeof RoomMembers> = (args) => <RoomMembers {...args} />;
 
 export const Default = Template.bind({});
 Default.args = {
-	loading: false,
+	isSuccess: true,
 	members: [
 		{
 			_id: 'rocket.cat',
@@ -32,30 +43,16 @@ Default.args = {
 			},
 		},
 	],
-	text: 'filter',
-	type: 'online',
-	setText: action('Lorem Ipsum'),
-	setType: action('online'),
-	total: 123,
-	loadMoreItems: action('loadMoreItems'),
-	rid: '!roomId',
-	isTeam: false,
-	isDirect: false,
-	reload: action('reload'),
 };
 
 export const Loading = Template.bind({});
 Loading.args = {
-	loading: true,
-	setText: action('setText'),
-	setType: action('setType'),
-	loadMoreItems: action('loadMoreItems'),
-	reload: action('reload'),
+	isPending: true,
 };
 
 export const WithABACRoom = Template.bind({});
 WithABACRoom.args = {
-	loading: false,
+	isSuccess: true,
 	members: [
 		{
 			_id: 'rocket.cat',
@@ -69,22 +66,12 @@ WithABACRoom.args = {
 			},
 		},
 	],
-	text: 'filter',
-	type: 'online',
-	setText: action('Lorem Ipsum'),
-	setType: action('online'),
-	total: 123,
-	loadMoreItems: action('loadMoreItems'),
-	rid: '!roomId',
-	isTeam: false,
-	isDirect: false,
-	reload: action('reload'),
 	isABACRoom: true,
 };
 
 export const WithInvitedMember = Template.bind({});
 WithInvitedMember.args = {
-	loading: false,
+	isSuccess: true,
 	members: [
 		{
 			_id: 'rocket.cat',
@@ -98,15 +85,11 @@ WithInvitedMember.args = {
 			name: 'Rocket.Cat',
 		},
 	],
-	text: 'filter',
-	type: 'online',
-	setText: action('Lorem Ipsum'),
-	setType: action('online'),
-	total: 123,
-	loadMoreItems: action('loadMoreItems'),
-	rid: '!roomId',
-	isTeam: false,
-	isDirect: false,
-	reload: action('reload'),
-	isABACRoom: true,
+};
+
+export const Empty = Template.bind({});
+Empty.args = {
+	isSuccess: true,
+	members: [],
+	total: 0,
 };
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
index 4651eb74239e6..adee124911fb6 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
@@ -14,21 +14,24 @@ import {
 	ContextualbarSection,
 	ContextualbarDialog,
 } from '@rocket.chat/ui-client';
-import { useTranslation, useSetting } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement, FormEventHandler, ComponentProps, MouseEvent, ElementType } from 'react';
-import { useMemo } from 'react';
+import { useId, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 import { GroupedVirtuoso } from 'react-virtuoso';
 
 import { MembersListDivider } from './MembersListDivider';
 import RoomMembersRow from './RoomMembersRow';
 import InfiniteListAnchor from '../../../../components/InfiniteListAnchor';
+import ResultsLiveRegion from '../../../../components/ResultsLiveRegion';
 import type { RoomMember } from '../../../hooks/useMembersList';
 
 type RoomMembersProps = {
 	rid: IRoom['_id'];
 	isTeam?: boolean;
 	isDirect?: boolean;
-	loading: boolean;
+	isPending: boolean;
+	isSuccess: boolean;
 	text: string;
 	type: string;
 	setText: FormEventHandler<HTMLInputElement>;
@@ -47,7 +50,8 @@ type RoomMembersProps = {
 };
 
 const RoomMembers = ({
-	loading,
+	isPending,
+	isSuccess,
 	members = [],
 	text,
 	type = 'online',
@@ -67,7 +71,8 @@ const RoomMembers = ({
 	reload,
 	isABACRoom = false,
 }: RoomMembersProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
+	const membersListId = useId();
 	const inputRef = useAutoFocus<HTMLInputElement>(true);
 	const itemData = useMemo(() => ({ onClickView, rid }), [onClickView, rid]);
 
@@ -143,55 +148,63 @@ const RoomMembers = ({
 			<ContextualbarSection>
 				<TextInput
 					placeholder={t('Search_by_username')}
+					aria-label={t('Search_by_username')}
+					aria-controls={isSuccess ? membersListId : undefined}
 					value={text}
 					ref={inputRef}
 					onChange={setText}
 					addon={<Icon name='magnifier' size='x20' />}
 				/>
 				<Box w='x144' mis={8}>
-					<Select onChange={(value): void => setType(value as 'online' | 'all')} value={type} options={options} />
+					<Select
+						aria-controls={isSuccess ? membersListId : undefined}
+						options={options}
+						value={type}
+						onChange={(value): void => setType(value as 'online' | 'all')}
+					/>
 				</Box>
 			</ContextualbarSection>
 			<ContextualbarContent p={0} pb={12}>
-				{loading && (
+				<ResultsLiveRegion shouldAnnounce={isSuccess} itemCount={members.length} />
+				{isPending && (
 					<Box pi={24} pb={12}>
 						<Throbber size='x12' />
 					</Box>
 				)}
-
 				{error && (
 					<Box pi={24} pb={12}>
 						<Callout type='danger'>{error.message}</Callout>
 					</Box>
 				)}
-
-				{!loading && members.length <= 0 && <ContextualbarEmptyContent title={t('No_members_found')} />}
-
-				{!loading && members.length > 0 && (
+				{isSuccess && (
 					<>
-						<Box pi={24} pb={12}>
-							<Box is='span' color='hint' fontScale='p2'>
-								{t('Showing_current_of_total', { current: members.length, total })}
+						{members.length > 0 && (
+							<Box pi={24} pb={12}>
+								<Box is='span' color='hint' fontScale='p2'>
+									{t('Showing_current_of_total', { current: members.length, total })}
+								</Box>
 							</Box>
-						</Box>
-
-						<Box w='full' h='full' overflow='hidden' flexShrink={1}>
-							<VirtualizedScrollbars>
-								<GroupedVirtuoso
-									style={{
-										height: '100%',
-										width: '100%',
-									}}
-									overscan={50}
-									groupCounts={counts}
-									groupContent={(index): ReactElement => titles[index]}
-									// eslint-disable-next-line react/no-multi-comp
-									components={{ Footer: () => <InfiniteListAnchor loadMore={loadMoreMembers} /> }}
-									itemContent={(index): ReactElement => (
-										<RowComponent useRealName={useRealName} data={itemData} user={members[index]} index={index} reload={reload} />
-									)}
-								/>
-							</VirtualizedScrollbars>
+						)}
+						<Box id={membersListId} w='full' h='full' overflow='hidden' flexShrink={1}>
+							{members.length <= 0 && <ContextualbarEmptyContent title={t('No_members_found')} />}
+							{members.length > 0 && (
+								<VirtualizedScrollbars>
+									<GroupedVirtuoso
+										style={{
+											height: '100%',
+											width: '100%',
+										}}
+										overscan={50}
+										groupCounts={counts}
+										groupContent={(index): ReactElement => titles[index]}
+										// eslint-disable-next-line react/no-multi-comp
+										components={{ Footer: () => <InfiniteListAnchor loadMore={loadMoreMembers} /> }}
+										itemContent={(index): ReactElement => (
+											<RowComponent useRealName={useRealName} data={itemData} user={members[index]} index={index} reload={reload} />
+										)}
+									/>
+								</VirtualizedScrollbars>
+							)}
 						</Box>
 					</>
 				)}
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersWithData.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersWithData.tsx
index c44c31f5e9cbd..1b7da39d06fa6 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersWithData.tsx
@@ -55,7 +55,7 @@ const RoomMembersWithData = ({ rid }: { rid: IRoom['_id'] }): ReactElement => {
 
 	const debouncedText = useDebouncedValue(text, 800);
 
-	const { data, fetchNextPage, isPending, refetch, hasNextPage } = useMembersList(
+	const { data, fetchNextPage, isPending, isSuccess, refetch, hasNextPage } = useMembersList(
 		useMemo(() => ({ rid, type, limit: 20, debouncedText, roomType: room?.t as validRoomType }), [rid, type, debouncedText, room?.t]),
 	);
 
@@ -118,7 +118,8 @@ const RoomMembersWithData = ({ rid }: { rid: IRoom['_id'] }): ReactElement => {
 			rid={rid}
 			isTeam={isTeam}
 			isDirect={isDirect}
-			loading={isPending}
+			isPending={isPending}
+			isSuccess={isSuccess}
 			type={type}
 			text={text}
 			setText={handleTextChange}
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap b/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap
index 5bcec7746337c..3040ae602973c 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap
@@ -46,6 +46,8 @@ exports[`renders Default without crashing 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
+                aria-controls=":r0:"
+                aria-label="Search_by_username"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 placeholder="Search_by_username"
                 size="1"
@@ -69,7 +71,7 @@ exports[`renders Default without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:r8:"
+                aria-labelledby="react-aria-:r9:"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
@@ -100,7 +102,7 @@ exports[`renders Default without crashing 1`] = `
                 </div>
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:r8:"
+                  id="react-aria-:r9:"
                 >
                   Online
                 </span>
@@ -116,6 +118,12 @@ exports[`renders Default without crashing 1`] = `
           <div
             class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-1w66n2o"
           >
+            <div
+              role="status"
+              style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+            >
+              __count__result_found
+            </div>
             <div
               class="rcx-box rcx-box--full rcx-css-nyqak3"
             >
@@ -127,6 +135,7 @@ exports[`renders Default without crashing 1`] = `
             </div>
             <div
               class="rcx-box rcx-box--full rcx-css-4k230l"
+              id=":r0:"
             >
               <div
                 class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
@@ -211,6 +220,204 @@ exports[`renders Default without crashing 1`] = `
 </body>
 `;
 
+exports[`renders Empty without crashing 1`] = `
+<body>
+  <div>
+    <div
+      class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-yefw2m"
+    >
+      <span
+        data-focus-scope-start="true"
+        hidden=""
+      />
+      <div
+        style="position: relative; user-select: auto; width: 380px; height: 100%; max-width: 50%; min-width: 380px; min-height: 100%; box-sizing: border-box; flex-shrink: 0;"
+      >
+        <div
+          aria-labelledby="contextualbarTitle"
+          class="rcx-box rcx-box--full rcx-vertical-bar rcx-css-ohm8rb"
+          role="dialog"
+          tabindex="-1"
+        >
+          <div
+            class="rcx-box rcx-box--full rcx-css-142wtci"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
+            >
+              <i
+                aria-hidden="true"
+                class="rcx-box rcx-box--full rcx-icon--name-members rcx-icon rcx-css-1yal9it"
+              >
+                
+              </i>
+              <h5
+                class="rcx-box rcx-box--full rcx-css-1spko5i"
+                id="contextualbarTitle"
+              >
+                Members
+              </h5>
+            </div>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__section rcx-css-16mbly4"
+          >
+            <label
+              class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
+            >
+              <input
+                aria-controls=":ra:"
+                aria-label="Search_by_username"
+                class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
+                placeholder="Search_by_username"
+                size="1"
+                type="text"
+                value="filter"
+              />
+              <span
+                class="rcx-box rcx-box--full rcx-input-box__addon"
+              >
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-magnifier rcx-icon rcx-css-4pvxx3"
+                >
+                  
+                </i>
+              </span>
+            </label>
+            <div
+              class="rcx-box rcx-box--full rcx-css-l1qvi5"
+            >
+              <button
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-labelledby="react-aria-:rj:"
+                class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
+                type="button"
+              >
+                <div
+                  aria-hidden="true"
+                  data-a11y-ignore="aria-hidden-focus"
+                  data-react-aria-prevent-focus="true"
+                  data-testid="hidden-select-container"
+                  style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+                >
+                  <label>
+                    <select
+                      tabindex="-1"
+                    >
+                      <option />
+                      <option
+                        value="online"
+                      >
+                        online
+                      </option>
+                      <option
+                        value="all"
+                      >
+                        all
+                      </option>
+                    </select>
+                  </label>
+                </div>
+                <span
+                  class="rcx-box rcx-box--full rcx-css-e3nij6"
+                  id="react-aria-:rj:"
+                >
+                  Online
+                </span>
+                <i
+                  aria-hidden="true"
+                  class="rcx-box rcx-box--full rcx-icon--name-chevron-down rcx-icon rcx-css-1wz6xj9"
+                >
+                  
+                </i>
+              </button>
+            </div>
+          </div>
+          <div
+            class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-1w66n2o"
+          >
+            <div
+              role="status"
+              style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+            >
+              No_results_found
+            </div>
+            <div
+              class="rcx-box rcx-box--full rcx-css-4k230l"
+              id=":ra:"
+            >
+              <div
+                class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-r8c38r"
+              >
+                <div
+                  class="rcx-states"
+                >
+                  <i
+                    aria-hidden="true"
+                    class="rcx-box rcx-box--full rcx-states__icon rcx-icon--name-magnifier rcx-icon rcx-css-d884y5"
+                  >
+                    
+                  </i>
+                  <h3
+                    class="rcx-states__title"
+                  >
+                    No_members_found
+                  </h3>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; top: -5px; left: 0px; cursor: row-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 10px; height: 100%; top: 0px; cursor: col-resize; right: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 100%; height: 10px; left: 0px; cursor: row-resize; bottom: -5px;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 3px; height: 100%; top: 0px; left: 0px; cursor: col-resize; z-index: 99;"
+          >
+            <div
+              class="rcx-box rcx-box--full rcx-css-r98g7d"
+            />
+          </div>
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; top: -10px; cursor: ne-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; right: -10px; bottom: -10px; cursor: se-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; bottom: -10px; cursor: sw-resize;"
+          />
+          <div
+            class=""
+            style="position: absolute; user-select: none; width: 20px; height: 20px; left: -10px; top: -10px; cursor: nw-resize;"
+          />
+        </div>
+      </div>
+      <span
+        data-focus-scope-end="true"
+        hidden=""
+      />
+    </div>
+  </div>
+</body>
+`;
+
 exports[`renders Loading without crashing 1`] = `
 <body>
   <div>
@@ -257,11 +464,12 @@ exports[`renders Loading without crashing 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
+                aria-label="Search_by_username"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 placeholder="Search_by_username"
                 size="1"
                 type="text"
-                value=""
+                value="filter"
               />
               <span
                 class="rcx-box rcx-box--full rcx-input-box__addon"
@@ -280,7 +488,7 @@ exports[`renders Loading without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:rh:"
+                aria-labelledby="react-aria-:rt:"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
@@ -311,7 +519,7 @@ exports[`renders Loading without crashing 1`] = `
                 </div>
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:rh:"
+                  id="react-aria-:rt:"
                 >
                   Online
                 </span>
@@ -327,6 +535,10 @@ exports[`renders Loading without crashing 1`] = `
           <div
             class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-1w66n2o"
           >
+            <div
+              role="status"
+              style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+            />
             <div
               class="rcx-box rcx-box--full rcx-css-nyqak3"
             >
@@ -440,6 +652,8 @@ exports[`renders WithABACRoom without crashing 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
+                aria-controls=":ru:"
+                aria-label="Search_by_username"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 placeholder="Search_by_username"
                 size="1"
@@ -463,7 +677,7 @@ exports[`renders WithABACRoom without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:rq:"
+                aria-labelledby="react-aria-:r17:"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
@@ -494,7 +708,7 @@ exports[`renders WithABACRoom without crashing 1`] = `
                 </div>
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:rq:"
+                  id="react-aria-:r17:"
                 >
                   Online
                 </span>
@@ -510,6 +724,12 @@ exports[`renders WithABACRoom without crashing 1`] = `
           <div
             class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-1w66n2o"
           >
+            <div
+              role="status"
+              style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+            >
+              __count__result_found
+            </div>
             <div
               class="rcx-box rcx-box--full rcx-css-nyqak3"
             >
@@ -521,6 +741,7 @@ exports[`renders WithABACRoom without crashing 1`] = `
             </div>
             <div
               class="rcx-box rcx-box--full rcx-css-4k230l"
+              id=":ru:"
             >
               <div
                 class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
@@ -651,6 +872,8 @@ exports[`renders WithInvitedMember without crashing 1`] = `
               class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
             >
               <input
+                aria-controls=":r18:"
+                aria-label="Search_by_username"
                 class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
                 placeholder="Search_by_username"
                 size="1"
@@ -674,7 +897,7 @@ exports[`renders WithInvitedMember without crashing 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-labelledby="react-aria-:r13:"
+                aria-labelledby="react-aria-:r1h:"
                 class="rcx-box rcx-box--full rcx-select rcx-css-1vw6rc6"
                 type="button"
               >
@@ -705,7 +928,7 @@ exports[`renders WithInvitedMember without crashing 1`] = `
                 </div>
                 <span
                   class="rcx-box rcx-box--full rcx-css-e3nij6"
-                  id="react-aria-:r13:"
+                  id="react-aria-:r1h:"
                 >
                   Online
                 </span>
@@ -721,6 +944,12 @@ exports[`renders WithInvitedMember without crashing 1`] = `
           <div
             class="rcx-box rcx-box--full rcx-vertical-bar__content rcx-css-1w66n2o"
           >
+            <div
+              role="status"
+              style="border: 0px; clip-path: inset(50%); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
+            >
+              __count__result_found
+            </div>
             <div
               class="rcx-box rcx-box--full rcx-css-nyqak3"
             >
@@ -732,6 +961,7 @@ exports[`renders WithInvitedMember without crashing 1`] = `
             </div>
             <div
               class="rcx-box rcx-box--full rcx-css-4k230l"
+              id=":r18:"
             >
               <div
                 class="rcx-box rcx-box--full rcx-css-vlo1oi rcx-css-1cb6i7s"
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx b/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx
index f0978a439ef6f..6b9ad90565726 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx
@@ -14,19 +14,22 @@ import {
 } from '@rocket.chat/ui-client';
 import { useTranslation, useUserId, useRoomToolbox } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
-import { useMemo, useState, useCallback } from 'react';
+import { useMemo, useState, useCallback, useId } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
 import ThreadListItem from './components/ThreadListItem';
 import { useThreadsList } from './hooks/useThreadsList';
+import ResultsLiveRegion from '../../../../components/ResultsLiveRegion';
 import { getErrorMessage } from '../../../../lib/errorHandling';
 import { useRoom, useRoomSubscription } from '../../contexts/RoomContext';
 import { useGoToThread } from '../../hooks/useGoToThread';
 
 type ThreadType = 'all' | 'following' | 'unread';
 
+// TODO: Refactor this component to isolate the data from the visual
 const ThreadList = () => {
 	const t = useTranslation();
+	const threadListId = useId();
 
 	const { closeTab } = useRoomToolbox();
 
@@ -125,6 +128,8 @@ const ThreadList = () => {
 			</ContextualbarHeader>
 			<ContextualbarSection>
 				<TextInput
+					aria-label={t('Search_Messages')}
+					aria-controls={isSuccess ? threadListId : undefined}
 					placeholder={t('Search_Messages')}
 					addon={<Icon name='magnifier' size='x20' />}
 					ref={autoFocusRef}
@@ -132,49 +137,54 @@ const ThreadList = () => {
 					onChange={handleSearchTextChange}
 				/>
 				<Box w='x144' mis={8}>
-					<Select options={typeOptions} value={type} onChange={(value) => handleTypeChange(String(value))} />
+					<Select
+						aria-controls={isSuccess ? threadListId : undefined}
+						options={typeOptions}
+						value={type}
+						onChange={(value) => handleTypeChange(String(value))}
+					/>
 				</Box>
 			</ContextualbarSection>
-			<ContextualbarContent paddingInline={0}>
+			<ContextualbarContent paddingInline={0} ref={ref}>
+				<ResultsLiveRegion shouldAnnounce={isSuccess} itemCount={itemCount} />
 				{isPending && (
 					<Box pi={24} pb={12}>
 						<Throbber size='x12' />
 					</Box>
 				)}
-
 				{error && (
 					<Callout mi={24} type='danger'>
 						{getErrorMessage(error, t('Something_went_wrong'))}
 					</Callout>
 				)}
-
-				{isSuccess && itemCount === 0 && <ContextualbarEmptyContent title={t('No_Threads')} />}
-
-				<Box flexGrow={1} flexShrink={1} overflow='hidden' display='flex' ref={ref}>
-					{!error && itemCount > 0 && items.length > 0 && (
-						<VirtualizedScrollbars>
-							<Virtuoso
-								style={{
-									height: blockSize,
-									width: inlineSize,
-								}}
-								totalCount={itemCount}
-								endReached={() => fetchNextPage()}
-								overscan={25}
-								data={items}
-								itemContent={(_index, data: IThreadMainMessage) => (
-									<ThreadListItem
-										thread={data}
-										unread={subscription?.tunread ?? []}
-										unreadUser={subscription?.tunreadUser ?? []}
-										unreadGroup={subscription?.tunreadGroup ?? []}
-										onClick={handleThreadClick}
-									/>
-								)}
-							/>
-						</VirtualizedScrollbars>
-					)}
-				</Box>
+				{isSuccess && (
+					<Box id={threadListId} w='full' h='full' overflow='hidden' flexShrink={1}>
+						{items.length === 0 && <ContextualbarEmptyContent title={t('No_Threads')} />}
+						{items.length > 0 && (
+							<VirtualizedScrollbars>
+								<Virtuoso
+									style={{
+										height: blockSize,
+										width: inlineSize,
+									}}
+									totalCount={itemCount}
+									endReached={() => fetchNextPage()}
+									overscan={25}
+									data={items}
+									itemContent={(_index, data: IThreadMainMessage) => (
+										<ThreadListItem
+											thread={data}
+											unread={subscription?.tunread ?? []}
+											unreadUser={subscription?.tunreadUser ?? []}
+											unreadGroup={subscription?.tunreadGroup ?? []}
+											onClick={handleThreadClick}
+										/>
+									)}
+								/>
+							</VirtualizedScrollbars>
+						)}
+					</Box>
+				)}
 			</ContextualbarContent>
 		</ContextualbarDialog>
 	);
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index b8e5891f1c420..d1b1a73acd6f2 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -7110,6 +7110,10 @@
   "__count__messages_selected": "{{count}} messages selected",
   "__count__replies": "{{count}} replies",
   "__count__replies__date__": "{{count}} replies, {{date}}",
+  "__count__result_found": {
+     "one": "{{count}} result found",
+    "other": "{{count}} results found"
+  },
   "__count__tags__and__count__conversations__period__": "{{count}} tags and {{conversations}} conversations, {{period}}",
   "__count__without__assignee__": "{{count}} without assignee",
   "__count__without__department__": "{{count}} without department",