diff --git a/web/modals/threads/members/members-modal.css b/web/modals/threads/members/members-modal.css
index b285d61eb..e276cc09e 100644
--- a/web/modals/threads/members/members-modal.css
+++ b/web/modals/threads/members/members-modal.css
@@ -1,46 +1,53 @@
+div.membersContainer {
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  margin: 16px;
+}
+
 div.membersList {
   overflow: scroll;
   padding: 8px 0;
   color: var(--members-modal-member-text);
 }
 
 div.noScroll {
   overflow: hidden;
 }
 
 div.memberContainer {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   padding: 8px 16px;
 }
 
 div.memberContainer:hover {
   color: var(--members-modal-member-text-hover);
 }
 
 div.memberContainerWithMenuOpen {
   color: var(--members-modal-member-text-hover);
 }
 
 div.memberInfo {
   font-size: var(--l-font-18);
   display: flex;
   align-items: center;
   gap: 10px;
 }
 
 div.memberAction {
   position: relative;
 }
 
 h5.memberletterHeader {
   margin: 16px;
   color: var(--members-modal-member-text);
   font-size: var(--s-font-14);
 }
 
 div.noUsers {
   padding-top: 16px;
   text-align: center;
 }
diff --git a/web/modals/threads/members/members-modal.react.js b/web/modals/threads/members/members-modal.react.js
new file mode 100644
index 000000000..f52706c8e
--- /dev/null
+++ b/web/modals/threads/members/members-modal.react.js
@@ -0,0 +1,91 @@
+// @flow
+
+import * as React from 'react';
+
+import { threadInfoSelector } from 'lib/selectors/thread-selectors';
+import { userStoreSearchIndex } from 'lib/selectors/user-selectors';
+import { memberHasAdminPowers, memberIsAdmin } from 'lib/shared/thread-utils';
+import { type RelativeMemberInfo } from 'lib/types/thread-types';
+
+import Search from '../../../components/search.react';
+import Tabs from '../../../components/tabs.react';
+import { useSelector } from '../../../redux/redux-utils';
+import Modal from '../../modal.react';
+import ThreadMembersList from './members-list.react';
+import css from './members-modal.css';
+
+type Props = {
+  +threadID: string,
+  +onClose: () => void,
+};
+function ThreadMembersModal(props: Props): React.Node {
+  const { threadID, onClose } = props;
+
+  const [tab, setTab] = React.useState<'All Members' | 'Admins'>('All Members');
+  const [searchText, setSearchText] = React.useState('');
+
+  const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]);
+  const { members: threadMembersNotFiltered } = threadInfo;
+
+  const userSearchIndex = useSelector(userStoreSearchIndex);
+  const userIDs = React.useMemo(
+    () => userSearchIndex.getSearchResults(searchText),
+    [searchText, userSearchIndex],
+  );
+
+  const allMembers = React.useMemo(
+    () =>
+      threadMembersNotFiltered.filter(
+        (member: RelativeMemberInfo) =>
+          searchText.length === 0 || userIDs.includes(member.id),
+      ),
+    [searchText.length, threadMembersNotFiltered, userIDs],
+  );
+  const adminMembers = React.useMemo(
+    () =>
+      allMembers.filter(
+        (member: RelativeMemberInfo) =>
+          memberIsAdmin(member, threadInfo) || memberHasAdminPowers(member),
+      ),
+    [allMembers, threadInfo],
+  );
+
+  const allUsersTab = React.useMemo(
+    () => (
+      <Tabs.Item id="All Members" header="All Members">
+        <ThreadMembersList threadInfo={threadInfo} threadMembers={allMembers} />
+      </Tabs.Item>
+    ),
+    [allMembers, threadInfo],
+  );
+
+  const allAdminsTab = React.useMemo(
+    () => (
+      <Tabs.Item id="Admins" header="Admins">
+        <ThreadMembersList
+          threadInfo={threadInfo}
+          threadMembers={adminMembers}
+        />
+      </Tabs.Item>
+    ),
+    [adminMembers, threadInfo],
+  );
+
+  return (
+    <Modal name="Members" onClose={onClose}>
+      <div className={css.membersContainer}>
+        <Search
+          onChangeText={setSearchText}
+          searchText={searchText}
+          placeholder="Search members"
+        />
+        <Tabs.Container activeTab={tab} setTab={setTab}>
+          {allUsersTab}
+          {allAdminsTab}
+        </Tabs.Container>
+      </div>
+    </Modal>
+  );
+}
+
+export default ThreadMembersModal;