diff --git a/code/client/src/ui/pages/workspace/components/ManageWorkspaceDialog.tsx b/code/client/src/ui/pages/workspace/components/ManageWorkspaceDialog.tsx
index 1bbcb63a..cf113a55 100644
--- a/code/client/src/ui/pages/workspace/components/ManageWorkspaceDialog.tsx
+++ b/code/client/src/ui/pages/workspace/components/ManageWorkspaceDialog.tsx
@@ -2,20 +2,19 @@ import Dialog from '@ui/components/dialog/Dialog';
 import { RxCross1 } from 'react-icons/rx';
 import { MdManageAccounts } from 'react-icons/md';
 import './ManageMembersDialog.scss';
+import { WorkspaceMeta } from '@notespace/shared/src/workspace/types/workspace';
 
 type ManageWorkspaceDialogProps = {
-  members: string[];
+  workspace: WorkspaceMeta;
   onAddMember: (email: string) => void;
   onRemoveMember: (email: string) => void;
-  isPrivate: boolean;
   toggleVisibility: () => void;
 };
 
 function ManageWorkspaceDialog({
-  members,
+  workspace,
   onAddMember,
   onRemoveMember,
-  isPrivate,
   toggleVisibility,
 }: ManageWorkspaceDialogProps) {
   return (
@@ -28,13 +27,13 @@ function ManageWorkspaceDialog({
       submitText="Add Member"
       extraContent={
         <div className="manage-workspace-dialog">
-          <button onClick={toggleVisibility}>Make {isPrivate ? 'Public' : 'Private'}</button>
+          <button onClick={toggleVisibility}>Make {workspace.isPrivate ? 'Public' : 'Private'}</button>
           <h4>Current Members</h4>
           <ul>
-            {members?.map(member => (
+            {workspace.members?.map((member: string) => (
               <li key={member}>
                 <p>{member}</p>
-                {members.length > 1 && (
+                {workspace.members.length > 1 && (
                   <button onClick={() => onRemoveMember(member)}>
                     <RxCross1 />
                   </button>
diff --git a/code/client/src/ui/pages/workspaces/components/WorkspaceContextMenu.tsx b/code/client/src/ui/pages/workspaces/components/WorkspaceContextMenu.tsx
index 1f07db67..7dab28f9 100644
--- a/code/client/src/ui/pages/workspaces/components/WorkspaceContextMenu.tsx
+++ b/code/client/src/ui/pages/workspaces/components/WorkspaceContextMenu.tsx
@@ -1,44 +1,31 @@
 import PopupMenu from '@ui/components/popup-menu/PopupMenu';
-import { ReactNode, useEffect, useState } from 'react';
+import { ReactNode } from 'react';
 import { MdDelete, MdEdit } from 'react-icons/md';
 import { useAuth } from '@/contexts/auth/useAuth';
 import ManageWorkspaceDialog from '@ui/pages/workspace/components/ManageWorkspaceDialog';
+import { WorkspaceMeta } from '@notespace/shared/src/workspace/types/workspace';
 
 type WorkspaceContextMenuProps = {
+  workspace: WorkspaceMeta;
   children: ReactNode;
   onRename: () => void;
   onDelete: () => void;
-  onGetMembers: () => Promise<string[]>;
   onAddMember: (email: string) => Promise<void>;
   onRemoveMember: (email: string) => Promise<void>;
-  isPrivate: boolean;
   toggleVisibility: () => Promise<void>;
 };
 
 function WorkspaceContextMenu({
+  workspace,
   children,
   onRename,
   onDelete,
-  onGetMembers,
   onAddMember,
   onRemoveMember,
-  isPrivate,
   toggleVisibility,
 }: WorkspaceContextMenuProps) {
-  const [members, setMembers] = useState<string[]>([]);
-  const [isMember, setIsMember] = useState(false);
   const { currentUser } = useAuth();
-
-  useEffect(() => {
-    async function fetchMembers() {
-      const members = await onGetMembers();
-      setMembers(members);
-      setIsMember(members.includes(currentUser?.email || ''));
-    }
-    fetchMembers();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [currentUser]);
-
+  const isMember = workspace.members.includes(currentUser?.email || '');
   return (
     <PopupMenu item={children} enabled={isMember}>
       <button onClick={onRename}>
@@ -46,10 +33,9 @@ function WorkspaceContextMenu({
         Rename
       </button>
       <ManageWorkspaceDialog
-        members={members}
+        workspace={workspace}
         onAddMember={onAddMember}
         onRemoveMember={onRemoveMember}
-        isPrivate={isPrivate}
         toggleVisibility={toggleVisibility}
       />
       <button onClick={onDelete}>
diff --git a/code/client/src/ui/pages/workspaces/components/WorkspaceView.tsx b/code/client/src/ui/pages/workspaces/components/WorkspaceView.tsx
index c906924b..2a350520 100644
--- a/code/client/src/ui/pages/workspaces/components/WorkspaceView.tsx
+++ b/code/client/src/ui/pages/workspaces/components/WorkspaceView.tsx
@@ -24,7 +24,6 @@ function WorkspaceView({
   onSelect,
   onDelete,
   onRename,
-  onGetMembers,
   onAddMember,
   onRemoveMember,
   toggleVisibility,
@@ -45,7 +44,7 @@ function WorkspaceView({
     <div className="table-row">
       <Checkbox checked={isSelected} onChange={onCheckboxSelected} onClick={e => e.stopPropagation()} />
       {component}
-      <p>{workspace.members}</p>
+      <p>{workspace.members.length}</p>
       <p>{formatDate(workspace.createdAt)}</p>
       <p>{workspace.isPrivate ? 'Private' : 'Public'}</p>
     </div>
@@ -54,12 +53,11 @@ function WorkspaceView({
     WorkspaceComponent
   ) : (
     <WorkspaceContextMenu
+      workspace={workspace}
       onRename={() => setIsEditing(true)}
       onDelete={onDelete}
-      onGetMembers={onGetMembers}
       onAddMember={onAddMember}
       onRemoveMember={onRemoveMember}
-      isPrivate={workspace.isPrivate}
       toggleVisibility={toggleVisibility}
     >
       <Link to={`/workspaces/${workspace.id}`}>{WorkspaceComponent}</Link>
diff --git a/code/server/src/controllers/http/handlers/workspacesHandlers.ts b/code/server/src/controllers/http/handlers/workspacesHandlers.ts
index b2786f7b..ad68b70c 100644
--- a/code/server/src/controllers/http/handlers/workspacesHandlers.ts
+++ b/code/server/src/controllers/http/handlers/workspacesHandlers.ts
@@ -21,7 +21,7 @@ function workspacesHandlers(services: Services, io: Server) {
       id,
       name,
       createdAt: new Date().toISOString(),
-      members: 1,
+      members: [req.user!.email],
       isPrivate,
     };
     io.emit('createdWorkspace', workspace);
@@ -48,7 +48,7 @@ function workspacesHandlers(services: Services, io: Server) {
     if (!wid) throw new InvalidParameterError('Workspace id is required');
     const newProps = req.body as Partial<WorkspaceMeta>;
     await services.workspaces.updateWorkspace(wid, newProps);
-    io.emit('updatedWorkspace', { id: wid, ...newProps } as WorkspaceMeta);
+    io.emit('updatedWorkspace', { id: wid, ...newProps });
     httpResponse.noContent(res).send();
   };
 
@@ -65,7 +65,8 @@ function workspacesHandlers(services: Services, io: Server) {
     if (!wid) throw new InvalidParameterError('Workspace id is required');
     const { email } = req.body;
     if (!email) throw new InvalidParameterError('Email is required');
-    await services.workspaces.addWorkspaceMember(wid, email);
+    const members = await services.workspaces.addWorkspaceMember(wid, email);
+    io.emit('updatedWorkspace', { id: wid, members });
     httpResponse.noContent(res).send();
   };
 
@@ -74,14 +75,15 @@ function workspacesHandlers(services: Services, io: Server) {
     if (!wid) throw new InvalidParameterError('Workspace id is required');
     const { email } = req.body;
     if (!email) throw new InvalidParameterError('Email is required');
-    await services.workspaces.removeWorkspaceMember(wid, email);
+    const members = await services.workspaces.removeWorkspaceMember(wid, email);
+    io.emit('updatedWorkspace', { id: wid, members });
     httpResponse.noContent(res).send();
   };
 
   const searchWorkspaces = async (req: Request, res: Response) => {
     const { query, skip, limit } = req.query;
     const searchParams: SearchParams = getSearchParams({ query, skip, limit });
-    const workspaces = await services.workspaces.searchWorkspaces(searchParams);
+    const workspaces = await services.workspaces.searchWorkspaces(searchParams, req.user?.email);
     httpResponse.ok(res).json(workspaces);
   };
 
diff --git a/code/server/src/databases/memory/MemoryResourcesDB.ts b/code/server/src/databases/memory/MemoryResourcesDB.ts
index f4d15cc2..9d5984d7 100644
--- a/code/server/src/databases/memory/MemoryResourcesDB.ts
+++ b/code/server/src/databases/memory/MemoryResourcesDB.ts
@@ -15,6 +15,7 @@ export class MemoryResourcesDB implements ResourcesRepository {
 
     // create resource
     const id = uuid();
+    const now = new Date().toISOString();
     workspace.resources[id] = {
       id,
       name,
@@ -22,8 +23,8 @@ export class MemoryResourcesDB implements ResourcesRepository {
       type,
       parent: parent || wid,
       children: [],
-      createdAt: new Date().toISOString(),
-      updatedAt: new Date().toISOString(),
+      createdAt: now,
+      updatedAt: now,
     };
 
     // update parent
diff --git a/code/server/src/databases/memory/MemoryUsersDB.ts b/code/server/src/databases/memory/MemoryUsersDB.ts
index ec1cde9a..2016eb6d 100644
--- a/code/server/src/databases/memory/MemoryUsersDB.ts
+++ b/code/server/src/databases/memory/MemoryUsersDB.ts
@@ -27,4 +27,10 @@ export class MemoryUsersDB implements UsersRepository {
   async getUsers(): Promise<User[]> {
     return Object.values(Memory.users);
   }
+
+  async getUserByEmail(email: string): Promise<User> {
+    const user = Object.values(Memory.users).find(user => user.email === email);
+    if (!user) throw new NotFoundError(`User not found`);
+    return user;
+  }
 }
diff --git a/code/server/src/databases/memory/MemoryWorkspacesDB.ts b/code/server/src/databases/memory/MemoryWorkspacesDB.ts
index 78991572..3b8834c1 100644
--- a/code/server/src/databases/memory/MemoryWorkspacesDB.ts
+++ b/code/server/src/databases/memory/MemoryWorkspacesDB.ts
@@ -14,6 +14,7 @@ export class MemoryWorkspacesDB implements WorkspacesRepository {
 
   async createWorkspace(name: string, isPrivate: boolean): Promise<string> {
     const id = uuid();
+    const now = new Date().toISOString();
     const root: Resource = {
       id,
       name: 'root',
@@ -21,10 +22,9 @@ export class MemoryWorkspacesDB implements WorkspacesRepository {
       type: ResourceType.FOLDER,
       parent: '',
       children: [],
-      createdAt: '',
-      updatedAt: '',
+      createdAt: now,
+      updatedAt: now,
     };
-    const now = new Date().toISOString();
     Memory.workspaces[id] = { id, name, isPrivate, resources: { [id]: root }, createdAt: now, members: [] };
     return id;
   }
@@ -32,10 +32,7 @@ export class MemoryWorkspacesDB implements WorkspacesRepository {
   async getWorkspaces(email?: string): Promise<WorkspaceMeta[]> {
     return Object.values(Memory.workspaces)
       .filter(workspace => (email ? workspace.members.includes(email) : !workspace.isPrivate))
-      .map(props => {
-        const workspace = omit(props, ['resources']);
-        return { ...workspace, members: workspace.members?.length || 0 };
-      });
+      .map(props => omit(props, ['resources']));
   }
 
   async getWorkspace(id: string): Promise<Workspace> {
@@ -62,29 +59,27 @@ export class MemoryWorkspacesDB implements WorkspacesRepository {
     delete Memory.workspaces[id];
   }
 
-  async addWorkspaceMember(wid: string, userId: string): Promise<void> {
+  async addWorkspaceMember(wid: string, userId: string): Promise<string[]> {
     const workspace = Memory.workspaces[wid];
     if (!workspace) throw new NotFoundError(`Workspace not found`);
     Memory.workspaces[wid].members.push(userId);
+    return Memory.workspaces[wid].members;
   }
 
-  async removeWorkspaceMember(wid: string, userId: string): Promise<void> {
+  async removeWorkspaceMember(wid: string, userId: string): Promise<string[]> {
     const workspace = Memory.workspaces[wid];
     if (!workspace) throw new NotFoundError(`Workspace not found`);
     Memory.workspaces[wid].members = Memory.workspaces[wid].members.filter(member => member !== userId);
+    return Memory.workspaces[wid].members;
   }
 
-  async searchWorkspaces(searchParams: SearchParams): Promise<WorkspaceMeta[]> {
+  async searchWorkspaces(searchParams: SearchParams, email?: string): Promise<WorkspaceMeta[]> {
     const { query, skip, limit } = searchParams;
     return Object.values(Memory.workspaces)
-      .filter(workspace => !workspace.isPrivate) // public workspaces
+      .filter(workspace => !workspace.isPrivate || workspace.members.includes(email || '')) // filter accessible workspaces
       .filter(workspace => (query ? workspace.name.toLowerCase().includes(query.toLowerCase()) : true)) // search by name
       .sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()) // sort results by creation date (newest first)
       .slice(skip, skip + limit) // paginate results
-      .map(workspace => ({
-        // convert to WorkspaceMeta
-        ...omit(workspace, ['resources']),
-        members: workspace.members?.length || 0,
-      }));
+      .map(workspace => omit(workspace, ['resources'])); // convert to WorkspaceMeta
   }
 }
diff --git a/code/server/src/databases/postgres/PostgresUsersDB.ts b/code/server/src/databases/postgres/PostgresUsersDB.ts
index 1984ace2..1fbd5f9a 100644
--- a/code/server/src/databases/postgres/PostgresUsersDB.ts
+++ b/code/server/src/databases/postgres/PostgresUsersDB.ts
@@ -31,4 +31,14 @@ export class PostgresUsersDB implements UsersRepository {
   async getUsers(): Promise<User[]> {
     return await sql`select * from "user"`;
   }
+
+  async getUserByEmail(email: string): Promise<User> {
+    const results: User[] = await sql`
+      select *
+      from "user"
+      where email = ${email}
+    `;
+    if (isEmpty(results)) throw new NotFoundError('User not found');
+    return results[0];
+  }
 }
diff --git a/code/server/src/databases/postgres/PostgresWorkspacesDB.ts b/code/server/src/databases/postgres/PostgresWorkspacesDB.ts
index 6bed7a0a..7eee4d3a 100644
--- a/code/server/src/databases/postgres/PostgresWorkspacesDB.ts
+++ b/code/server/src/databases/postgres/PostgresWorkspacesDB.ts
@@ -18,13 +18,12 @@ export class PostgresWorkspacesDB implements WorkspacesRepository {
   }
 
   async getWorkspaces(email?: string): Promise<WorkspaceMeta[]> {
-    const condition = email ? sql`${email} = any(members)` : sql`"isPrivate" = false`;
     const results = await sql`
       select row_to_json(t) as workspace
       from (
-        select *, count(members) as members
+        select *
         from workspace
-        where ${condition}
+        where ${email ? sql`${email} = any(members)` : sql`"isPrivate" = false`}
         group by id
         order by "createdAt" desc
       ) as t
@@ -75,32 +74,34 @@ export class PostgresWorkspacesDB implements WorkspacesRepository {
     if (isEmpty(results)) throw new NotFoundError(`Workspace not found`);
   }
 
-  async addWorkspaceMember(wid: string, email: string): Promise<void> {
-    const results = await sql`
+  async addWorkspaceMember(wid: string, email: string): Promise<string[]> {
+    const result = await sql`
       update workspace
       set members = array_append(members, ${email}::text)
       where id = ${wid} and not ${email} = any(members)
-      returning id
+      returning members
     `;
-    if (isEmpty(results)) throw new NotFoundError(`Workspace not found or member already in workspace`);
+    if (isEmpty(result)) throw new NotFoundError(`Workspace not found`);
+    return result[0].members;
   }
 
-  async removeWorkspaceMember(wid: string, email: string): Promise<void> {
-    const results = await sql`
+  async removeWorkspaceMember(wid: string, email: string): Promise<string[]> {
+    const result = await sql`
       update workspace
       set members = array_remove(members, ${email}::text)
       where id = ${wid}
-      returning id
+      returning members
     `;
-    if (isEmpty(results)) throw new NotFoundError(`Workspace not found or member does not exist`);
+    if (isEmpty(result)) throw new NotFoundError(`Workspace not found`);
+    return result[0].members;
   }
 
-  async searchWorkspaces(searchParams: SearchParams): Promise<WorkspaceMeta[]> {
+  async searchWorkspaces(searchParams: SearchParams, email?: string): Promise<WorkspaceMeta[]> {
     const { query, skip, limit } = searchParams;
     return sql`
-        select *, array_length(members, 1) as members
+        select *
         from workspace
-        where "isPrivate" = false and name ilike ${'%' + query + '%'}
+        where ("isPrivate" = false or ${email || ''} = any(members)) and name ilike ${'%' + query + '%'}
         order by "createdAt" desc
         offset ${skip} limit ${limit}
     `;
diff --git a/code/server/src/databases/types.ts b/code/server/src/databases/types.ts
index f2f71d7b..6751cfa2 100644
--- a/code/server/src/databases/types.ts
+++ b/code/server/src/databases/types.ts
@@ -110,22 +110,22 @@ export interface WorkspacesRepository {
    */
   deleteWorkspace: (id: string) => Promise<void>;
   /**
-   * Add a member to a workspace
+   * Add a member to a workspace, returning the current list of members
    * @param wid
    * @param email
    */
-  addWorkspaceMember: (wid: string, email: string) => Promise<void>;
+  addWorkspaceMember: (wid: string, email: string) => Promise<string[]>;
   /**
-   * Remove a member from a workspace
+   * Remove a member from a workspace, returning the current list of members
    * @param wid
    * @param email
    */
-  removeWorkspaceMember: (wid: string, email: string) => Promise<void>;
+  removeWorkspaceMember: (wid: string, email: string) => Promise<string[]>;
   /**
    * Search workspaces by name
    * @param searchParams
    */
-  searchWorkspaces: (searchParams: SearchParams) => Promise<WorkspaceMeta[]>;
+  searchWorkspaces: (searchParams: SearchParams, email?: string) => Promise<WorkspaceMeta[]>;
 }
 
 export interface UsersRepository {
@@ -150,6 +150,10 @@ export interface UsersRepository {
    * Get all users from the database
    */
   getUsers: () => Promise<User[]>;
+  /**
+   * Get a user by email
+   */
+  getUserByEmail: (email: string) => Promise<User>;
 }
 
 export interface CommitsRepository {
diff --git a/code/server/src/services/WorkspacesService.ts b/code/server/src/services/WorkspacesService.ts
index abdd71c8..db24c7fd 100644
--- a/code/server/src/services/WorkspacesService.ts
+++ b/code/server/src/services/WorkspacesService.ts
@@ -47,21 +47,23 @@ export class WorkspacesService {
     return await this.databases.workspaces.getResources(wid);
   }
 
-  async addWorkspaceMember(wid: string, email: string) {
+  async addWorkspaceMember(wid: string, email: string): Promise<string[]> {
     validateId(wid);
     validateEmail(email);
-    await this.databases.workspaces.addWorkspaceMember(wid, email);
+    await this.databases.users.getUserByEmail(email); // ensure user exists
+    return await this.databases.workspaces.addWorkspaceMember(wid, email);
   }
 
-  async removeWorkspaceMember(wid: string, email: string) {
+  async removeWorkspaceMember(wid: string, email: string): Promise<string[]> {
     validateId(wid);
     validateEmail(email);
-    await this.databases.workspaces.removeWorkspaceMember(wid, email);
+    await this.databases.users.getUserByEmail(email); // ensure user exists
+    return await this.databases.workspaces.removeWorkspaceMember(wid, email);
   }
 
-  async searchWorkspaces(searchParams: SearchParams) {
+  async searchWorkspaces(searchParams: SearchParams, email?: string) {
     validatePositiveNumber(searchParams.skip);
     validatePositiveNumber(searchParams.limit);
-    return await this.databases.workspaces.searchWorkspaces(searchParams);
+    return await this.databases.workspaces.searchWorkspaces(searchParams, email);
   }
 }
diff --git a/code/server/test/workspaces/workspaces.test.ts b/code/server/test/workspaces/workspaces.test.ts
index 265b5631..53049c4b 100644
--- a/code/server/test/workspaces/workspaces.test.ts
+++ b/code/server/test/workspaces/workspaces.test.ts
@@ -25,7 +25,7 @@ describe('Workspace operations', () => {
 
   test('should update a workspace', async () => {
     const id = await services.workspaces.createWorkspace('test', false);
-    await services.workspaces.updateWorkspace(id, 'test2');
+    await services.workspaces.updateWorkspace(id, { name: 'test2' });
     const workspace = await services.workspaces.getWorkspace(id);
     expect(workspace.name).toEqual('test2');
   });
diff --git a/code/shared/src/workspace/types/workspace.ts b/code/shared/src/workspace/types/workspace.ts
index aa4295c5..ae0913ce 100644
--- a/code/shared/src/workspace/types/workspace.ts
+++ b/code/shared/src/workspace/types/workspace.ts
@@ -4,7 +4,7 @@ export type WorkspaceMeta = {
   name: string;
   id: string;
   createdAt: string;
-  members: number | string[];
+  members: string[];
   isPrivate: boolean;
 };