From 4943de62edac142686fde43498d2bf9a9f18e086 Mon Sep 17 00:00:00 2001
From: Artyom Ivanov <zuodleq@gmail.com>
Date: Sat, 25 Apr 2026 01:32:32 +0300
Subject: [PATCH] feat(sidebar): add UI for personal room categories
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Expose “Create room category” in Create New
* Allow assigning/removing rooms via room menus
* Show empty custom categories in the sidebar
* Support deleting categories from the sidebar header
* Support renaming categories from the sidebar header
---
 .../app/api/server/v1/user-room-categories.ts |  36 +++++
 .../hooks/UserRoomCategoryForRoomModal.tsx    | 153 ++++++++++++++++++
 .../meteor/client/hooks/useRoomMenuActions.ts |  50 +++++-
 .../client/hooks/useUserRoomCategories.ts     |  29 ++--
 .../actions/CreateUserRoomCategoryModal.tsx   | 101 ++++++++++++
 .../hooks/useCreateNewMenu.tsx                |  23 ++-
 .../RoomList/RenameUserRoomCategoryModal.tsx  |  87 ++++++++++
 .../client/sidebar/RoomList/RoomList.tsx      |  48 ++++--
 .../sidebar/RoomList/RoomListCollapser.tsx    |  19 ++-
 .../RoomList/UserRoomCategoryGroupMenu.tsx    |  78 +++++++++
 .../client/sidebar/hooks/useRoomList.ts       |   8 +-
 .../Info/ManageUserRoomCategoryModal.tsx      | 153 ++++++++++++++++++
 .../Info/hooks/useRoomActions.ts              |  35 +++-
 packages/i18n/src/locales/en.i18n.json        |  20 +++
 packages/i18n/src/locales/ru.i18n.json        |  22 ++-
 .../models/src/models/UserRoomCategories.ts   |  27 ++++
 .../rest-typings/src/v1/userRoomCategories.ts |   4 +
 17 files changed, 850 insertions(+), 43 deletions(-)
 create mode 100644 apps/meteor/client/hooks/UserRoomCategoryForRoomModal.tsx
 create mode 100644 apps/meteor/client/navbar/NavBarPagesGroup/actions/CreateUserRoomCategoryModal.tsx
 create mode 100644 apps/meteor/client/sidebar/RoomList/RenameUserRoomCategoryModal.tsx
 create mode 100644 apps/meteor/client/sidebar/RoomList/UserRoomCategoryGroupMenu.tsx
 create mode 100644 apps/meteor/client/views/room/contextualBar/Info/ManageUserRoomCategoryModal.tsx

diff --git a/apps/meteor/app/api/server/v1/user-room-categories.ts b/apps/meteor/app/api/server/v1/user-room-categories.ts
index 81dd2007bffdb..7d563413b790c 100644
--- a/apps/meteor/app/api/server/v1/user-room-categories.ts
+++ b/apps/meteor/app/api/server/v1/user-room-categories.ts
@@ -24,6 +24,16 @@ const addRoomToCategoryBodySchema = ajv.compile<{ categoryName: string; roomId:
 	additionalProperties: false,
 });
 
+const renameCategoryBodySchema = ajv.compile<{ oldName: string; newName: string }>({
+	type: 'object',
+	properties: {
+		oldName: { type: 'string' },
+		newName: { type: 'string' },
+	},
+	required: ['oldName', 'newName'],
+	additionalProperties: false,
+});
+
 const categoriesResponseSchema = ajv.compile<{ categories: IUserRoomCategory[] }>({
 	type: 'object',
 	properties: {
@@ -154,3 +164,29 @@ API.v1.post(
 		return API.v1.success({});
 	},
 );
+
+API.v1.post(
+	'user-room-categories/rename-category',
+	{
+		authRequired: true,
+		body: renameCategoryBodySchema,
+		response: { 200: emptyResponseSchema, 400: emptyResponseSchema },
+	},
+	async function action() {
+		const { oldName, newName } = this.bodyParams;
+
+		check(oldName, String);
+		check(newName, String);
+
+		const trimmedOldName = oldName.trim();
+		const trimmedNewName = newName.trim();
+
+		if (!trimmedOldName || !trimmedNewName) {
+			return API.v1.failure('oldName and newName are required');
+		}
+
+		await UserRoomCategories.renameCategory(this.userId, trimmedOldName, trimmedNewName);
+
+		return API.v1.success({});
+	},
+);
diff --git a/apps/meteor/client/hooks/UserRoomCategoryForRoomModal.tsx b/apps/meteor/client/hooks/UserRoomCategoryForRoomModal.tsx
new file mode 100644
index 0000000000000..076428240a024
--- /dev/null
+++ b/apps/meteor/client/hooks/UserRoomCategoryForRoomModal.tsx
@@ -0,0 +1,153 @@
+import type { SelectOption } from '@rocket.chat/fuselage';
+import {
+	Box,
+	Button,
+	Callout,
+	Field,
+	FieldGroup,
+	FieldLabel,
+	FieldRow,
+	Modal,
+	ModalClose,
+	ModalContent,
+	ModalFooter,
+	ModalFooterControllers,
+	ModalHeader,
+	ModalTitle,
+	Select,
+} from '@rocket.chat/fuselage';
+import { useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useCallback, useEffect, useId, useMemo, useState } from 'react';
+
+import { useUserRoomCategories } from './useUserRoomCategories';
+import CreateUserRoomCategoryModal from '../navbar/NavBarPagesGroup/actions/CreateUserRoomCategoryModal';
+
+type UserRoomCategoryForRoomModalProps = {
+	roomId: string;
+	roomName?: string;
+	onClose: () => void;
+};
+
+const UserRoomCategoryForRoomModal = ({ roomId, roomName, onClose }: UserRoomCategoryForRoomModalProps) => {
+	const t = useTranslation();
+	const titleId = useId();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const setModal = useSetModal();
+
+	const { data: categories = [], addRoomToCategory, removeRoomFromCategory, refetch } = useUserRoomCategories();
+
+	const containingCategory = useMemo(() => categories.find((c) => (c.roomIds ?? []).includes(roomId)), [categories, roomId]);
+
+	const selectOptions = useMemo<Array<SelectOption>>(() => categories.map((c) => [c.name, c.name]), [categories]);
+	const [selectedCategory, setSelectedCategory] = useState('');
+	const [submitting, setSubmitting] = useState(false);
+
+	useEffect(() => {
+		if (containingCategory?.name) {
+			setSelectedCategory(containingCategory.name);
+			return;
+		}
+		if (categories[0]?.name) {
+			setSelectedCategory((prev) => (categories.some((c) => c.name === prev) ? prev : categories[0].name));
+		}
+	}, [categories, containingCategory?.name]);
+
+	const openCreateCategoryModal = useCallback(() => {
+		setModal(
+			<CreateUserRoomCategoryModal
+				onClose={() => {
+					void refetch();
+					setModal(<UserRoomCategoryForRoomModal roomId={roomId} roomName={roomName} onClose={onClose} />);
+				}}
+			/>,
+		);
+	}, [onClose, refetch, roomId, roomName, setModal]);
+
+	const handleApply = async () => {
+		if (!selectedCategory) {
+			return;
+		}
+		setSubmitting(true);
+		try {
+			await addRoomToCategory(selectedCategory, roomId);
+			dispatchToastMessage({ type: 'success', message: t('User_room_category_assign_success', { name: selectedCategory }) });
+			onClose();
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			dispatchToastMessage({ type: 'error', message: message || t('Something_went_wrong') });
+		} finally {
+			setSubmitting(false);
+		}
+	};
+
+	const handleRemove = async () => {
+		if (!containingCategory) {
+			return;
+		}
+		setSubmitting(true);
+		try {
+			await removeRoomFromCategory(containingCategory.name, roomId);
+			dispatchToastMessage({ type: 'success', message: t('User_room_category_remove_success') });
+			onClose();
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			dispatchToastMessage({ type: 'error', message: message || t('Something_went_wrong') });
+		} finally {
+			setSubmitting(false);
+		}
+	};
+
+	return (
+		<Modal aria-labelledby={titleId}>
+			<ModalHeader>
+				<ModalTitle id={titleId}>
+					{t('Add_to_user_room_category')}
+					{roomName ? `: ${roomName}` : ''}
+				</ModalTitle>
+				<ModalClose tabIndex={-1} onClick={onClose} />
+			</ModalHeader>
+			<ModalContent mbe={2}>
+				<FieldGroup>
+					<Box mbe={12}>{t('User_room_category_add_description')}</Box>
+					{categories.length === 0 ? (
+						<>
+							<Callout type='info' mbe={12}>
+								{t('User_room_category_empty_hint')}
+							</Callout>
+							<Button onClick={openCreateCategoryModal}>{t('Create_user_room_category')}</Button>
+						</>
+					) : (
+						<>
+							<Field>
+								<FieldLabel>{t('User_room_category_select')}</FieldLabel>
+								<FieldRow>
+									<Select options={selectOptions} value={selectedCategory} onChange={(value) => setSelectedCategory(String(value))} />
+								</FieldRow>
+							</Field>
+							<Box display='flex' flexDirection='column' gap={8} mbs={12}>
+								<Button primary loading={submitting} onClick={() => void handleApply()}>
+									{t('Apply')}
+								</Button>
+								{containingCategory && (
+									<Button secondary danger loading={submitting} onClick={() => void handleRemove()}>
+										{t('User_room_category_remove_from', { name: containingCategory.name })}
+									</Button>
+								)}
+								<Button secondary small onClick={openCreateCategoryModal}>
+									{t('Create_user_room_category')}
+								</Button>
+							</Box>
+						</>
+					)}
+				</FieldGroup>
+			</ModalContent>
+			<ModalFooter>
+				<ModalFooterControllers>
+					<Button onClick={onClose}>{t('Close')}</Button>
+				</ModalFooterControllers>
+			</ModalFooter>
+		</Modal>
+	);
+};
+
+export default UserRoomCategoryForRoomModal;
diff --git a/apps/meteor/client/hooks/useRoomMenuActions.ts b/apps/meteor/client/hooks/useRoomMenuActions.ts
index ec89eef7d18ba..36b5299baf754 100644
--- a/apps/meteor/client/hooks/useRoomMenuActions.ts
+++ b/apps/meteor/client/hooks/useRoomMenuActions.ts
@@ -1,13 +1,15 @@
 import type { RoomType } from '@rocket.chat/core-typings';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { usePermission, useSetting, useUserSubscription } from '@rocket.chat/ui-contexts';
-import { useMemo } from 'react';
+import { usePermission, useSetModal, useSetting, useToastMessageDispatch, useUserSubscription, useUserId } from '@rocket.chat/ui-contexts';
+import { createElement, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import UserRoomCategoryForRoomModal from './UserRoomCategoryForRoomModal';
 import { useLeaveRoomAction } from './menuActions/useLeaveRoom';
 import { useToggleFavoriteAction } from './menuActions/useToggleFavoriteAction';
 import { useToggleReadAction } from './menuActions/useToggleReadAction';
 import { useHideRoomAction } from './useHideRoomAction';
+import { useUserRoomCategories } from './useUserRoomCategories';
 import { useOmnichannelPrioritiesMenu } from '../views/omnichannel/hooks/useOmnichannelPrioritiesMenu';
 
 type RoomMenuActionsProps = {
@@ -30,7 +32,13 @@ export const useRoomMenuActions = ({
 	hideDefaultOptions,
 }: RoomMenuActionsProps): { title: string; items: GenericMenuItemProps[] }[] => {
 	const { t } = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const setModal = useSetModal();
+	const userId = useUserId();
 	const subscription = useUserSubscription(rid);
+	const { data: userRoomCategories = [], removeRoomFromCategory } = useUserRoomCategories();
+
+	const userCategoryContainingRoom = userRoomCategories.find((c) => (c.roomIds ?? []).includes(rid));
 
 	const isFavorite = Boolean(subscription?.f);
 	const canLeaveChannel = usePermission('leave-c');
@@ -83,6 +91,37 @@ export const useRoomMenuActions = ({
 							content: t('Leave_room'),
 							onClick: handleLeave,
 						},
+						userId &&
+							!isOmnichannelRoom && {
+								id: 'addUserRoomCategory',
+								icon: 'sort-amount-down',
+								content: t('Add_to_user_room_category'),
+								onClick: () => {
+									setModal(
+										createElement(UserRoomCategoryForRoomModal, {
+											roomId: rid,
+											roomName: name,
+											onClose: () => setModal(null),
+										}),
+									);
+								},
+							},
+						userCategoryContainingRoom && {
+							id: 'removeUserRoomCategory',
+							icon: 'cross',
+							content: t('User_room_category_remove_room'),
+							onClick: () => {
+								void (async () => {
+									try {
+										await removeRoomFromCategory(userCategoryContainingRoom.name, rid);
+										dispatchToastMessage({ type: 'success', message: t('User_room_category_remove_success') });
+									} catch (error) {
+										const message = error instanceof Error ? error.message : String(error);
+										dispatchToastMessage({ type: 'error', message: message || t('Something_went_wrong') });
+									}
+								})();
+							},
+						},
 					].filter(Boolean) as GenericMenuItemProps[])
 				: [],
 		[
@@ -97,6 +136,13 @@ export const useRoomMenuActions = ({
 			canLeave,
 			handleLeave,
 			isOmnichannelRoom,
+			userCategoryContainingRoom,
+			removeRoomFromCategory,
+			rid,
+			name,
+			dispatchToastMessage,
+			setModal,
+			userId,
 		],
 	);
 
diff --git a/apps/meteor/client/hooks/useUserRoomCategories.ts b/apps/meteor/client/hooks/useUserRoomCategories.ts
index e0758a244ab40..8a7fdbc8b4012 100644
--- a/apps/meteor/client/hooks/useUserRoomCategories.ts
+++ b/apps/meteor/client/hooks/useUserRoomCategories.ts
@@ -1,6 +1,5 @@
 import { useEndpoint, useUserId } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useEffect } from 'react';
 
 export const useUserRoomCategories = () => {
 	const userId = useUserId();
@@ -10,6 +9,7 @@ export const useUserRoomCategories = () => {
 	const addRoomEndpoint = useEndpoint('POST', '/v1/user-room-categories/add-room');
 	const removeRoomEndpoint = useEndpoint('POST', '/v1/user-room-categories/remove-room');
 	const removeCategoryEndpoint = useEndpoint('POST', '/v1/user-room-categories/remove-category');
+	const renameCategoryEndpoint = useEndpoint('POST', '/v1/user-room-categories/rename-category');
 
 	const queryKey = ['userRoomCategories', userId];
 
@@ -61,25 +61,17 @@ export const useUserRoomCategories = () => {
 		onSuccess: invalidate,
 	});
 
-	const removeRoomFromCategory = async (categoryName: string, roomId: string) =>
-		removeRoomMutation.mutateAsync({ categoryName, roomId });
-
-	const removeCategory = async (name: string) => removeCategoryMutation.mutateAsync(name);
+	const renameCategoryMutation = useMutation({
+		mutationFn: async ({ oldName, newName }: { oldName: string; newName: string }) => {
+			await renameCategoryEndpoint({ oldName, newName });
+		},
+		onSuccess: invalidate,
+	});
 
-	useEffect(() => {
-		(globalThis as Record<string, unknown>).__sidebarCustomCategories = {
-			addCategory,
-			addRoomToCategory,
-			removeRoomFromCategory,
-			removeCategory,
-			refresh: query.refetch,
-			getCategories: () => query.data ?? [],
-		};
+	const removeRoomFromCategory = async (categoryName: string, roomId: string) => removeRoomMutation.mutateAsync({ categoryName, roomId });
 
-		return () => {
-			delete (globalThis as Record<string, unknown>).__sidebarCustomCategories;
-		};
-	}, [addCategory, addRoomToCategory, removeRoomFromCategory, removeCategory, query.refetch, query.data]);
+	const removeCategory = async (name: string) => removeCategoryMutation.mutateAsync(name);
+	const renameCategory = async (oldName: string, newName: string) => renameCategoryMutation.mutateAsync({ oldName, newName });
 
 	return {
 		...query,
@@ -87,5 +79,6 @@ export const useUserRoomCategories = () => {
 		addRoomToCategory,
 		removeRoomFromCategory,
 		removeCategory,
+		renameCategory,
 	};
 };
diff --git a/apps/meteor/client/navbar/NavBarPagesGroup/actions/CreateUserRoomCategoryModal.tsx b/apps/meteor/client/navbar/NavBarPagesGroup/actions/CreateUserRoomCategoryModal.tsx
new file mode 100644
index 0000000000000..846fa89b3a1ba
--- /dev/null
+++ b/apps/meteor/client/navbar/NavBarPagesGroup/actions/CreateUserRoomCategoryModal.tsx
@@ -0,0 +1,101 @@
+import {
+	Box,
+	Button,
+	Field,
+	FieldError,
+	FieldGroup,
+	FieldLabel,
+	FieldRow,
+	Modal,
+	ModalClose,
+	ModalContent,
+	ModalFooter,
+	ModalFooterControllers,
+	ModalHeader,
+	ModalTitle,
+	TextInput,
+} from '@rocket.chat/fuselage';
+import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import type { FormEvent } from 'react';
+import { useId, useState } from 'react';
+
+import { useUserRoomCategories } from '../../../hooks/useUserRoomCategories';
+
+type CreateUserRoomCategoryModalProps = {
+	onClose: () => void;
+};
+
+const CreateUserRoomCategoryModal = ({ onClose }: CreateUserRoomCategoryModalProps) => {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const titleId = useId();
+	const nameFieldId = useId();
+	const { addCategory } = useUserRoomCategories();
+
+	const [name, setName] = useState('');
+	const [error, setError] = useState<string | undefined>();
+	const [submitting, setSubmitting] = useState(false);
+
+	const handleSubmit = async (e: FormEvent) => {
+		e.preventDefault();
+		const trimmed = name.trim();
+		if (!trimmed) {
+			setError(t('User_room_category_name_required'));
+			return;
+		}
+		setError(undefined);
+		setSubmitting(true);
+		try {
+			await addCategory(trimmed);
+			dispatchToastMessage({ type: 'success', message: t('User_room_category_created') });
+			onClose();
+		} catch (err) {
+			const message = err instanceof Error ? err.message : String(err);
+			dispatchToastMessage({ type: 'error', message: message || t('User_room_category_create_failed') });
+		} finally {
+			setSubmitting(false);
+		}
+	};
+
+	return (
+		<Modal aria-labelledby={titleId} wrapperFunction={(props) => <Box is='form' onSubmit={handleSubmit} {...props} />}>
+			<ModalHeader>
+				<ModalTitle id={titleId}>{t('Create_user_room_category')}</ModalTitle>
+				<ModalClose tabIndex={-1} onClick={onClose} />
+			</ModalHeader>
+			<ModalContent mbe={2}>
+				<FieldGroup>
+					<Field>
+						<FieldLabel htmlFor={nameFieldId}>{t('User_room_category_name')}</FieldLabel>
+						<FieldRow>
+							<TextInput
+								id={nameFieldId}
+								value={name}
+								onChange={(e) => setName(e.currentTarget.value)}
+								aria-invalid={Boolean(error)}
+								aria-describedby={error ? `${nameFieldId}-error` : undefined}
+							/>
+						</FieldRow>
+						{error && (
+							<FieldError id={`${nameFieldId}-error`} mbs={4}>
+								{error}
+							</FieldError>
+						)}
+					</Field>
+				</FieldGroup>
+			</ModalContent>
+			<ModalFooter>
+				<ModalFooterControllers>
+					<Button secondary onClick={onClose}>
+						{t('Cancel')}
+					</Button>
+					<Button primary loading={submitting} type='submit'>
+						{t('Create')}
+					</Button>
+				</ModalFooterControllers>
+			</ModalFooter>
+		</Modal>
+	);
+};
+
+export default CreateUserRoomCategoryModal;
diff --git a/apps/meteor/client/navbar/NavBarPagesGroup/hooks/useCreateNewMenu.tsx b/apps/meteor/client/navbar/NavBarPagesGroup/hooks/useCreateNewMenu.tsx
index 633b193c48398..622e0a17bb727 100644
--- a/apps/meteor/client/navbar/NavBarPagesGroup/hooks/useCreateNewMenu.tsx
+++ b/apps/meteor/client/navbar/NavBarPagesGroup/hooks/useCreateNewMenu.tsx
@@ -1,17 +1,34 @@
-import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
+import { useAtLeastOnePermission, useUserId } from '@rocket.chat/ui-contexts';
 import { useTranslation } from 'react-i18next';
 
 import { useCreateNewItems } from './useCreateNewItems';
+import { useCreateRoomModal } from './useCreateRoomModal';
+import CreateUserRoomCategoryModal from '../actions/CreateUserRoomCategoryModal';
 
 const CREATE_ROOM_PERMISSIONS = ['create-c', 'create-p', 'create-d', 'start-discussion', 'start-discussion-other-user'];
 
 export const useCreateNewMenu = () => {
 	const { t } = useTranslation();
+	const userId = useUserId();
 	const showCreate = useAtLeastOnePermission(CREATE_ROOM_PERMISSIONS);
 
 	const createRoomItems = useCreateNewItems();
+	const openCreateUserRoomCategoryModal = useCreateRoomModal(CreateUserRoomCategoryModal);
 
-	const sections = [{ title: t('Create_new'), items: createRoomItems, permission: showCreate }];
+	const createUserRoomCategoryItem = userId
+		? {
+				id: 'user-room-category',
+				content: t('Create_user_room_category'),
+				icon: 'sort-amount-down' as const,
+				onClick: () => {
+					openCreateUserRoomCategoryModal();
+				},
+			}
+		: null;
 
-	return sections.filter((section) => section.permission);
+	const items = [...createRoomItems, ...(createUserRoomCategoryItem ? [createUserRoomCategoryItem] : [])];
+
+	const sections = [{ title: t('Create_new'), items, permission: showCreate || Boolean(userId) }];
+
+	return sections.filter((section) => section.permission && section.items.length > 0);
 };
diff --git a/apps/meteor/client/sidebar/RoomList/RenameUserRoomCategoryModal.tsx b/apps/meteor/client/sidebar/RoomList/RenameUserRoomCategoryModal.tsx
new file mode 100644
index 0000000000000..7b924731e6313
--- /dev/null
+++ b/apps/meteor/client/sidebar/RoomList/RenameUserRoomCategoryModal.tsx
@@ -0,0 +1,87 @@
+import {
+	Box,
+	Button,
+	Field,
+	FieldGroup,
+	FieldLabel,
+	FieldRow,
+	Modal,
+	ModalClose,
+	ModalContent,
+	ModalFooter,
+	ModalFooterControllers,
+	ModalHeader,
+	ModalTitle,
+	TextInput,
+} from '@rocket.chat/fuselage';
+import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import type { FormEvent } from 'react';
+import { useId, useState } from 'react';
+
+import { useUserRoomCategories } from '../../hooks/useUserRoomCategories';
+
+type RenameUserRoomCategoryModalProps = {
+	oldName: string;
+	onClose: () => void;
+};
+
+const RenameUserRoomCategoryModal = ({ oldName, onClose }: RenameUserRoomCategoryModalProps) => {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const { renameCategory } = useUserRoomCategories();
+	const titleId = useId();
+	const nameFieldId = useId();
+	const [name, setName] = useState(oldName);
+	const [submitting, setSubmitting] = useState(false);
+
+	const handleSubmit = async (e: FormEvent) => {
+		e.preventDefault();
+		const trimmed = name.trim();
+		if (!trimmed || trimmed === oldName) {
+			onClose();
+			return;
+		}
+		setSubmitting(true);
+		try {
+			await renameCategory(oldName, trimmed);
+			dispatchToastMessage({ type: 'success', message: t('User_room_category_rename_success') });
+			onClose();
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			dispatchToastMessage({ type: 'error', message: message || t('Something_went_wrong') });
+		} finally {
+			setSubmitting(false);
+		}
+	};
+
+	return (
+		<Modal aria-labelledby={titleId} wrapperFunction={(props) => <Box is='form' onSubmit={handleSubmit} {...props} />}>
+			<ModalHeader>
+				<ModalTitle id={titleId}>{t('User_room_category_rename_title')}</ModalTitle>
+				<ModalClose tabIndex={-1} onClick={onClose} />
+			</ModalHeader>
+			<ModalContent mbe={2}>
+				<FieldGroup>
+					<Field>
+						<FieldLabel htmlFor={nameFieldId}>{t('User_room_category_name')}</FieldLabel>
+						<FieldRow>
+							<TextInput id={nameFieldId} value={name} onChange={(e) => setName(e.currentTarget.value)} />
+						</FieldRow>
+					</Field>
+				</FieldGroup>
+			</ModalContent>
+			<ModalFooter>
+				<ModalFooterControllers>
+					<Button secondary onClick={onClose}>
+						{t('Cancel')}
+					</Button>
+					<Button primary loading={submitting} type='submit'>
+						{t('Save')}
+					</Button>
+				</ModalFooterControllers>
+			</ModalFooter>
+		</Modal>
+	);
+};
+
+export default RenameUserRoomCategoryModal;
diff --git a/apps/meteor/client/sidebar/RoomList/RoomList.tsx b/apps/meteor/client/sidebar/RoomList/RoomList.tsx
index 2403621675507..0ba93685fc07f 100644
--- a/apps/meteor/client/sidebar/RoomList/RoomList.tsx
+++ b/apps/meteor/client/sidebar/RoomList/RoomList.tsx
@@ -10,11 +10,12 @@ import RoomListCollapser from './RoomListCollapser';
 import RoomListRow from './RoomListRow';
 import RoomListRowWrapper from './RoomListRowWrapper';
 import RoomListWrapper from './RoomListWrapper';
+import UserRoomCategoryGroupMenu from './UserRoomCategoryGroupMenu';
 import { useOpenedRoom } from '../../lib/RoomManager';
 import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
 import { useCollapsedGroups } from '../hooks/useCollapsedGroups';
 import { usePreventDefault } from '../hooks/usePreventDefault';
-import { useRoomList } from '../hooks/useRoomList';
+import { SIDEBAR_BUILTIN_GROUP_KEYS, useRoomList } from '../hooks/useRoomList';
 import { useShortcutOpenMenu } from '../hooks/useShortcutOpenMenu';
 import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
 
@@ -52,15 +53,42 @@ const RoomList = () => {
 			<VirtualizedScrollbars>
 				<GroupedVirtuoso
 					groupCounts={groupsCount}
-					groupContent={(index) => (
-						<RoomListCollapser
-							collapsedGroups={collapsedGroups}
-							onClick={() => handleClick(groupsList[index])}
-							onKeyDown={(e) => handleKeyDown(e, groupsList[index])}
-							groupTitle={groupsList[index]}
-							unreadCount={groupedUnreadInfo[index]}
-						/>
-					)}
+					groupContent={(index) => {
+						const groupTitle = groupsList[index];
+						const isBuiltin = SIDEBAR_BUILTIN_GROUP_KEYS.has(groupTitle);
+						const headerActions = !isAnonymous && !isBuiltin ? <UserRoomCategoryGroupMenu categoryName={groupTitle} /> : undefined;
+						const ariaTitle = isBuiltin ? t(groupTitle) : groupTitle;
+						const displayTitle = headerActions ? (
+							<Box display='flex' alignItems='center' justifyContent='space-between' width='full'>
+								<Box is='span' flexGrow={1} flexShrink={1} style={{ minWidth: 0 }}>
+									{ariaTitle}
+								</Box>
+								<Box
+									is='span'
+									flexGrow={0}
+									flexShrink={0}
+									onClickCapture={(e) => e.stopPropagation()}
+									onMouseDownCapture={(e) => e.stopPropagation()}
+								>
+									{headerActions}
+								</Box>
+							</Box>
+						) : (
+							ariaTitle
+						);
+
+						return (
+							<RoomListCollapser
+								collapsedGroups={collapsedGroups}
+								onClick={() => handleClick(groupsList[index])}
+								onKeyDown={(e) => handleKeyDown(e, groupsList[index])}
+								groupTitle={groupTitle}
+								displayTitle={displayTitle}
+								ariaTitle={ariaTitle}
+								unreadCount={groupedUnreadInfo[index]}
+							/>
+						);
+					}}
 					{...(roomList.length > 0 && {
 						itemContent: (index) => roomList[index] && <RoomListRow data={itemData} item={roomList[index]} />,
 					})}
diff --git a/apps/meteor/client/sidebar/RoomList/RoomListCollapser.tsx b/apps/meteor/client/sidebar/RoomList/RoomListCollapser.tsx
index 465197e41db82..86f9bba9fecfe 100644
--- a/apps/meteor/client/sidebar/RoomList/RoomListCollapser.tsx
+++ b/apps/meteor/client/sidebar/RoomList/RoomListCollapser.tsx
@@ -1,25 +1,36 @@
 import type { ISubscription } from '@rocket.chat/core-typings';
 import { Badge, SidebarV2CollapseGroup } from '@rocket.chat/fuselage';
-import type { HTMLAttributes, KeyboardEvent, MouseEventHandler } from 'react';
+import type { HTMLAttributes, KeyboardEvent, MouseEventHandler, ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useUnreadDisplay } from '../hooks/useUnreadDisplay';
 
 type RoomListCollapserProps = {
 	groupTitle: string;
+	/** Visible section title (translated for built-in groups, raw name for user categories). */
+	displayTitle: ReactNode;
+	/** Plain-text title used for aria-labels. */
+	ariaTitle: string;
 	collapsedGroups: string[];
 	onClick: MouseEventHandler<HTMLElement>;
 	onKeyDown: (e: KeyboardEvent) => void;
 	unreadCount: Pick<ISubscription, 'userMentions' | 'groupMentions' | 'unread' | 'tunread' | 'tunreadUser' | 'tunreadGroup'>;
 } & Omit<HTMLAttributes<HTMLElement>, 'onClick' | 'onKeyDown'>;
-const RoomListCollapser = ({ groupTitle, unreadCount: unreadGroupCount, collapsedGroups, ...props }: RoomListCollapserProps) => {
+const RoomListCollapser = ({
+	groupTitle,
+	displayTitle,
+	ariaTitle,
+	unreadCount: unreadGroupCount,
+	collapsedGroups,
+	...props
+}: RoomListCollapserProps) => {
 	const { t } = useTranslation();
 
 	const { unreadTitle, unreadVariant, showUnread, unreadCount } = useUnreadDisplay(unreadGroupCount);
 
 	return (
 		<SidebarV2CollapseGroup
-			title={t(groupTitle)}
+			title={displayTitle as any}
 			expanded={!collapsedGroups.includes(groupTitle)}
 			badge={
 				showUnread ? (
@@ -29,7 +40,7 @@ const RoomListCollapser = ({ groupTitle, unreadCount: unreadGroupCount, collapse
 				) : undefined
 			}
 			aria-label={
-				!collapsedGroups.includes(groupTitle) ? t('Collapse_group', { group: t(groupTitle) }) : t('Expand_group', { group: t(groupTitle) })
+				!collapsedGroups.includes(groupTitle) ? t('Collapse_group', { group: ariaTitle }) : t('Expand_group', { group: ariaTitle })
 			}
 			{...props}
 		/>
diff --git a/apps/meteor/client/sidebar/RoomList/UserRoomCategoryGroupMenu.tsx b/apps/meteor/client/sidebar/RoomList/UserRoomCategoryGroupMenu.tsx
new file mode 100644
index 0000000000000..19cc03476f43f
--- /dev/null
+++ b/apps/meteor/client/sidebar/RoomList/UserRoomCategoryGroupMenu.tsx
@@ -0,0 +1,78 @@
+import { IconButton } from '@rocket.chat/fuselage';
+import { GenericMenu, GenericModal } from '@rocket.chat/ui-client';
+import { useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useCallback } from 'react';
+
+import RenameUserRoomCategoryModal from './RenameUserRoomCategoryModal';
+import { useUserRoomCategories } from '../../hooks/useUserRoomCategories';
+
+type UserRoomCategoryGroupMenuProps = {
+	categoryName: string;
+};
+
+const UserRoomCategoryGroupMenu = ({ categoryName }: UserRoomCategoryGroupMenuProps) => {
+	const t = useTranslation();
+	const setModal = useSetModal();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const { removeCategory } = useUserRoomCategories();
+
+	const openConfirmDelete = useCallback(() => {
+		const onConfirm = async () => {
+			try {
+				await removeCategory(categoryName);
+				dispatchToastMessage({ type: 'success', message: t('User_room_category_deleted') });
+			} catch (error) {
+				const message = error instanceof Error ? error.message : String(error);
+				dispatchToastMessage({ type: 'error', message: message || t('Something_went_wrong') });
+			} finally {
+				setModal(null);
+			}
+		};
+
+		setModal(
+			<GenericModal
+				variant='danger'
+				title={t('User_room_category_delete')}
+				onCancel={() => setModal(null)}
+				onConfirm={onConfirm}
+				confirmText={t('Delete')}
+			>
+				{t('User_room_category_delete_confirm', { name: categoryName })}
+			</GenericModal>,
+		);
+	}, [categoryName, dispatchToastMessage, removeCategory, setModal, t]);
+
+	const openRename = useCallback(() => {
+		setModal(<RenameUserRoomCategoryModal oldName={categoryName} onClose={() => setModal(null)} />);
+	}, [categoryName, setModal]);
+
+	return (
+		<GenericMenu
+			detached
+			mini
+			title={t('Options')}
+			button={<IconButton mini secondary flexShrink={0} icon='kebab' aria-label={t('Options')} />}
+			sections={[
+				{
+					items: [
+						{
+							id: 'rename-user-room-category',
+							content: t('User_room_category_rename'),
+							icon: 'edit',
+							onClick: openRename,
+						},
+						{
+							id: 'delete-user-room-category',
+							content: t('User_room_category_delete'),
+							icon: 'trash',
+							variant: 'danger',
+							onClick: openConfirmDelete,
+						},
+					],
+				},
+			]}
+		/>
+	);
+};
+
+export default UserRoomCategoryGroupMenu;
diff --git a/apps/meteor/client/sidebar/hooks/useRoomList.ts b/apps/meteor/client/sidebar/hooks/useRoomList.ts
index 5034071c7dd45..de002665c7f1d 100644
--- a/apps/meteor/client/sidebar/hooks/useRoomList.ts
+++ b/apps/meteor/client/sidebar/hooks/useRoomList.ts
@@ -28,6 +28,9 @@ const order = [
 	'Conversations',
 ] as const;
 
+/** Known sidebar section keys (i18n); any other `groupTitle` is a user-defined room category name. */
+export const SIDEBAR_BUILTIN_GROUP_KEYS = new Set<string>(order);
+
 type useRoomListReturnType = {
 	roomList: Array<SubscriptionWithRoom>;
 	groupsCount: number[];
@@ -145,9 +148,8 @@ export const useRoomList = ({ collapsedGroups }: { collapsedGroups?: string[] })
 
 			favoritesEnabled && favorite.size && groups.set('Favorites', favorite);
 			customCategoryRooms.forEach((rooms, categoryName) => {
-				if (rooms.size) {
-					groups.set(categoryName, rooms);
-				}
+				// Show empty categories as groups, so they are visible/manageable right after creation.
+				groups.set(categoryName, rooms);
 			});
 
 			sidebarGroupByType && team.size && groups.set('Teams', team);
diff --git a/apps/meteor/client/views/room/contextualBar/Info/ManageUserRoomCategoryModal.tsx b/apps/meteor/client/views/room/contextualBar/Info/ManageUserRoomCategoryModal.tsx
new file mode 100644
index 0000000000000..c347612e542c5
--- /dev/null
+++ b/apps/meteor/client/views/room/contextualBar/Info/ManageUserRoomCategoryModal.tsx
@@ -0,0 +1,153 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import {
+	Box,
+	Button,
+	Callout,
+	Field,
+	FieldGroup,
+	FieldLabel,
+	FieldRow,
+	Modal,
+	ModalClose,
+	ModalContent,
+	ModalFooter,
+	ModalFooterControllers,
+	ModalHeader,
+	ModalTitle,
+	Select,
+} from '@rocket.chat/fuselage';
+import { useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useCallback, useEffect, useId, useMemo, useState } from 'react';
+
+import { useUserRoomCategories } from '../../../../hooks/useUserRoomCategories';
+import CreateUserRoomCategoryModal from '../../../../navbar/NavBarPagesGroup/actions/CreateUserRoomCategoryModal';
+
+type ManageUserRoomCategoryModalProps = {
+	room: IRoom;
+	onClose: () => void;
+};
+
+const ManageUserRoomCategoryModal = ({ room, onClose }: ManageUserRoomCategoryModalProps) => {
+	const t = useTranslation();
+	const titleId = useId();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const setModal = useSetModal();
+	const roomId = room._id;
+
+	const { data: categories = [], addRoomToCategory, removeRoomFromCategory, refetch } = useUserRoomCategories();
+
+	const containingCategory = useMemo(() => categories.find((c) => (c.roomIds ?? []).includes(roomId)), [categories, roomId]);
+
+	const selectOptions = useMemo<Array<SelectOption>>(() => categories.map((c) => [c.name, c.name]), [categories]);
+
+	const [selectedCategory, setSelectedCategory] = useState('');
+
+	useEffect(() => {
+		if (containingCategory?.name) {
+			setSelectedCategory(containingCategory.name);
+			return;
+		}
+		if (categories[0]?.name) {
+			setSelectedCategory((prev) => (categories.some((c) => c.name === prev) ? prev : categories[0].name));
+		}
+	}, [categories, containingCategory?.name]);
+
+	const [submitting, setSubmitting] = useState(false);
+
+	const openCreateCategoryModal = useCallback(() => {
+		setModal(
+			<CreateUserRoomCategoryModal
+				onClose={() => {
+					void refetch();
+					setModal(<ManageUserRoomCategoryModal room={room} onClose={onClose} />);
+				}}
+			/>,
+		);
+	}, [onClose, refetch, room, setModal]);
+
+	const handleApply = async () => {
+		if (!selectedCategory) {
+			return;
+		}
+		setSubmitting(true);
+		try {
+			await addRoomToCategory(selectedCategory, roomId);
+			dispatchToastMessage({ type: 'success', message: t('User_room_category_assign_success', { name: selectedCategory }) });
+			onClose();
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			dispatchToastMessage({ type: 'error', message: message || t('Something_went_wrong') });
+		} finally {
+			setSubmitting(false);
+		}
+	};
+
+	const handleRemove = async () => {
+		if (!containingCategory) {
+			return;
+		}
+		setSubmitting(true);
+		try {
+			await removeRoomFromCategory(containingCategory.name, roomId);
+			dispatchToastMessage({ type: 'success', message: t('User_room_category_remove_success') });
+			onClose();
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			dispatchToastMessage({ type: 'error', message: message || t('Something_went_wrong') });
+		} finally {
+			setSubmitting(false);
+		}
+	};
+
+	return (
+		<Modal aria-labelledby={titleId}>
+			<ModalHeader>
+				<ModalTitle id={titleId}>{t('Add_to_user_room_category')}</ModalTitle>
+				<ModalClose tabIndex={-1} onClick={onClose} />
+			</ModalHeader>
+			<ModalContent mbe={2}>
+				<FieldGroup>
+					<Box mbe={12}>{t('User_room_category_add_description')}</Box>
+					{categories.length === 0 ? (
+						<>
+							<Callout type='info' mbe={12}>
+								{t('User_room_category_empty_hint')}
+							</Callout>
+							<Button onClick={openCreateCategoryModal}>{t('Create_user_room_category')}</Button>
+						</>
+					) : (
+						<>
+							<Field>
+								<FieldLabel>{t('User_room_category_select')}</FieldLabel>
+								<FieldRow>
+									<Select options={selectOptions} value={selectedCategory} onChange={(value) => setSelectedCategory(String(value))} />
+								</FieldRow>
+							</Field>
+							<Box display='flex' flexDirection='column' gap={8} mbs={12}>
+								<Button primary loading={submitting} onClick={() => void handleApply()}>
+									{t('Apply')}
+								</Button>
+								{containingCategory && (
+									<Button secondary danger loading={submitting} onClick={() => void handleRemove()}>
+										{t('User_room_category_remove_from', { name: containingCategory.name })}
+									</Button>
+								)}
+								<Button secondary small onClick={openCreateCategoryModal}>
+									{t('Create_user_room_category')}
+								</Button>
+							</Box>
+						</>
+					)}
+				</FieldGroup>
+			</ModalContent>
+			<ModalFooter>
+				<ModalFooterControllers>
+					<Button onClick={onClose}>{t('Close')}</Button>
+				</ModalFooterControllers>
+			</ModalFooter>
+		</Modal>
+	);
+};
+
+export default ManageUserRoomCategoryModal;
diff --git a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
index 201e0131646b4..fd7f16b5ecbea 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
@@ -1,7 +1,9 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useMemo } from 'react';
+import { useSetModal, useUserId } from '@rocket.chat/ui-contexts';
+import { createElement, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import ManageUserRoomCategoryModal from '../ManageUserRoomCategoryModal';
 import { useRoomConvertToTeam } from './actions/useRoomConvertToTeam';
 import { useRoomLeave } from './actions/useRoomLeave';
 import { useRoomMoveToTeam } from './actions/useRoomMoveToTeam';
@@ -18,6 +20,12 @@ export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 	const { onClickEnterRoom, onClickEdit, resetState } = options;
 
 	const { t } = useTranslation();
+	const userId = useUserId();
+	const setModal = useSetModal();
+
+	const openUserRoomCategoryModal = useCallback(() => {
+		setModal(createElement(ManageUserRoomCategoryModal, { room, onClose: () => setModal(null) }));
+	}, [room, setModal]);
 
 	const handleLeave = useRoomLeave(room);
 	const { handleDelete, canDeleteRoom } = useDeleteRoom(room, { reload: resetState });
@@ -55,6 +63,16 @@ export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 							},
 						]
 					: []),
+				...(userId && !['l'].includes(room.t)
+					? [
+							{
+								id: 'user-room-category',
+								content: t('Add_to_user_room_category'),
+								icon: 'sort-amount-down' as const,
+								onClick: openUserRoomCategoryModal,
+							},
+						]
+					: []),
 				...(handleLeave
 					? [
 							{
@@ -100,5 +118,18 @@ export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 		};
 
 		return memoizedActions;
-	}, [canDeleteRoom, handleConvertToTeam, handleDelete, handleHide, handleLeave, handleMoveToTeam, onClickEdit, onClickEnterRoom, t]);
+	}, [
+		canDeleteRoom,
+		handleConvertToTeam,
+		handleDelete,
+		handleHide,
+		handleLeave,
+		handleMoveToTeam,
+		onClickEdit,
+		onClickEnterRoom,
+		openUserRoomCategoryModal,
+		room.t,
+		t,
+		userId,
+	]);
 };
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 2abb096ac43b2..7fc199b196556 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -473,6 +473,7 @@
   "Add_topic": "Add topic",
   "Add_user": "Add user",
   "Add_users": "Add users",
+  "Add_to_user_room_category": "Add to personal room category",
   "Added__username__to_team": "<strong>added</strong> @{{user_added}} to this Team",
   "Added__username__to_this_team": "added @{{user_added}} to this team",
   "Adding_OAuth_Services": "Adding OAuth Services",
@@ -1592,6 +1593,7 @@
   "Create_trigger": "Create trigger",
   "Create_unique_rules_for_this_channel": "Create unique rules for this channel",
   "Create_unit": "Create unit",
+  "Create_user_room_category": "Create room category",
   "Created": "Created",
   "Created_as": "Created as",
   "Created_at": "Created at",
@@ -5713,6 +5715,24 @@
   "User_sent_a_message_on_channel": "<strong>{{username}}</strong> sent a message on <strong>{{channel}}</strong>",
   "User_sent_a_message_to_you": "<strong>{{username}}</strong> sent you a message",
   "User_started_a_new_conversation": "{{username}} started a new conversation",
+  "User_room_category_add_description": "Choose a sidebar category for this room. The room will be removed from any other personal category.",
+  "User_room_category_assign_success": "Room added to \"{{name}}\"",
+  "User_room_category_created": "Room category created",
+  "User_room_category_create_failed": "Could not create room category",
+  "User_room_category_delete": "Delete category",
+  "User_room_category_delete_confirm": "Remove category \"{{name}}\"? Rooms will stay in your sidebar in their default sections.",
+  "User_room_category_deleted": "Room category removed",
+  "User_room_category_empty_hint": "Create a room category from the Create new menu first.",
+  "User_room_category_manage": "Personal sidebar category",
+  "User_room_category_name": "Category name",
+  "User_room_category_name_required": "Enter a category name",
+  "User_room_category_rename": "Rename category",
+  "User_room_category_rename_title": "Rename room category",
+  "User_room_category_rename_success": "Room category renamed",
+  "User_room_category_remove_from": "Remove from \"{{name}}\"",
+  "User_room_category_remove_success": "Removed from personal category",
+  "User_room_category_remove_room": "Remove from my category",
+  "User_room_category_select": "Category",
   "User_status_disabled": "User status temporarily disabled to maintain performance.",
   "User_status_disabled_learn_more": "User status disabled",
   "User_status_disabled_learn_more_description": "Due to high volume of active connections, the service that handles user status is temporarily disabled. Administrators can re-enable this manually in the workspace settings.",
diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json
index d0ecdc864077a..6e8582a98bc38 100644
--- a/packages/i18n/src/locales/ru.i18n.json
+++ b/packages/i18n/src/locales/ru.i18n.json
@@ -327,6 +327,7 @@
   "Add_monitor": "Добавить монитор",
   "Add_user": "Добавить пользователя",
   "Add_users": "Добавить пользователей",
+  "Add_to_user_room_category": "Добавить в пользовательскую категорию",
   "Added__username__to_team": "<strong>добавил(-а)</strong>  @{{user_added}} в эту рабочую группу",
   "Added__username__to_this_team": "добавил @{{user_added}} в эту Команду",
   "Adding_OAuth_Services": "Добавление сервисы OAuth ",
@@ -1215,6 +1216,7 @@
   "Create_channels": "Создать канал",
   "Create_new": "Создать",
   "Create_new_members": "Создание новых участников",
+  "Create_user_room_category": "Создать новую категорию комнат",
   "Create_unique_rules_for_this_channel": "Создать выделенные правила для этого канала",
   "Created": "Создан",
   "Created_as": "Создан как",
@@ -4035,6 +4037,24 @@
   "User_sent_a_message_on_channel": "<strong>{{username}}</strong> отправил сообщение в<strong>{{channel}}</strong>",
   "User_sent_a_message_to_you": "<strong>{{username}}</strong> отправил Вам сообщение",
   "User_started_a_new_conversation": "{{username}} начал новую беседу",
+  "User_room_category_add_description": "Выберите пользовательскую категорию сайдбара для этой комнаты. Комната будет убрана из любой другой личной категории.",
+  "User_room_category_assign_success": "Комната добавлена в \"{{name}}\"",
+  "User_room_category_created": "Категория комнат создана",
+  "User_room_category_create_failed": "Не удалось создать категорию комнат",
+  "User_room_category_delete": "Удалить категорию",
+  "User_room_category_delete_confirm": "Удалить категорию \"{{name}}\"? Комнаты останутся в сайдбаре в своих обычных разделах.",
+  "User_room_category_deleted": "Категория комнат удалена",
+  "User_room_category_empty_hint": "Сначала создайте категорию комнат через меню \"Создать\".",
+  "User_room_category_manage": "Пользовательская категория сайдбара",
+  "User_room_category_name": "Название категории",
+  "User_room_category_name_required": "Введите название категории",
+  "User_room_category_rename": "Переименовать категорию",
+  "User_room_category_rename_title": "Переименовать категорию комнат",
+  "User_room_category_rename_success": "Категория комнат переименована",
+  "User_room_category_remove_from": "Убрать из \"{{name}}\"",
+  "User_room_category_remove_success": "Убрано из пользовательской категории",
+  "User_room_category_remove_room": "Убрать из моей категории",
+  "User_room_category_select": "Категория",
   "User_unmuted_by": "Пользователь {{user_unmuted}} перестал быть заглушенным благодаря пользователю {{user_by}}.",
   "User_unmuted_in_room": "Пользователь перестал быть заглушенным в комнате",
   "User_updated_successfully": "Пользователь успешно обновлен",
@@ -4982,4 +5002,4 @@
   "__username__is_no_longer__role__defined_by__user_by_": "{{username}} больше не {{role}} по решению {{user_by}}",
   "__username__was_set__role__by__user_by_": "{{username}} был установлен {{role}} по решению {{user_by}}",
   "__usersCount__people_will_be_invited": "{{usersCount}} человек будет приглашено"
-}
\ No newline at end of file
+}
diff --git a/packages/models/src/models/UserRoomCategories.ts b/packages/models/src/models/UserRoomCategories.ts
index c28aa6c0aa123..bfbb1a9e84831 100644
--- a/packages/models/src/models/UserRoomCategories.ts
+++ b/packages/models/src/models/UserRoomCategories.ts
@@ -107,4 +107,31 @@ export class UserRoomCategoriesRaw extends BaseRaw<IUserRoomCategories> implemen
 
 		return this.updateOne({ userId }, { $set: { categories } });
 	}
+
+	async renameCategory(userId: string, oldName: string, newName: string): Promise<UpdateResult> {
+		const doc = await this.findByUserId(userId);
+		if (!doc) {
+			throw new Error('User categories document not found');
+		}
+
+		const trimmedOldName = oldName.trim();
+		const trimmedNewName = newName.trim();
+
+		if (!trimmedOldName || !trimmedNewName) {
+			throw new Error('oldName and newName are required');
+		}
+
+		const targetIndex = doc.categories.findIndex((c) => c.name === trimmedOldName);
+		if (targetIndex === -1) {
+			throw new Error('Category not found');
+		}
+
+		if (doc.categories.some((c) => c.name === trimmedNewName)) {
+			throw new Error('Category already exists');
+		}
+
+		const categories = doc.categories.map((c, index) => (index === targetIndex ? { ...c, name: trimmedNewName } : c));
+
+		return this.updateOne({ userId }, { $set: { categories } });
+	}
 }
diff --git a/packages/rest-typings/src/v1/userRoomCategories.ts b/packages/rest-typings/src/v1/userRoomCategories.ts
index 21783d0268035..5e6b46fbc75ba 100644
--- a/packages/rest-typings/src/v1/userRoomCategories.ts
+++ b/packages/rest-typings/src/v1/userRoomCategories.ts
@@ -18,4 +18,8 @@ export type UserRoomCategoriesEndpoints = {
 	'/v1/user-room-categories/remove-category': {
 		POST: (params: { name: string }) => void;
 	};
+
+	'/v1/user-room-categories/rename-category': {
+		POST: (params: { oldName: string; newName: string }) => void;
+	};
 };