@@ -1,2 +1,3 @@
 export * from './chats.store'
-export * from './use-chat-actions'
\ No newline at end of file
+export * from './use-chat-actions'
+export * from './use-current-chat'
@@ -13,6 +13,8 @@ export function useChatActions() {
 
 	const [loaded, setLoaded] = useState(false)
 
+	const { currentChat, setCurrentChat } = useCurrentChat()
+
 	const onRenameChat = makePrivateRequest(async (uid: string, title: string) => {
 		const chat = chats.find((x) => x.uid === uid)
 
@@ -31,12 +33,37 @@ export function useChatActions() {
 
 	const onRemoveChat = makePrivateRequest(async (uid: string) => {
 		const chat = chats.find((x) => x.uid === uid)
-
 		const { status } = await removeChat(uid)
 
 		if (status !== 204 || !chat) return showMessage('Ошибка при переименовании чата')
 
-		setChats([...chats.filter((c) => c.uid !== uid)])
+		const currentIndex = chats.findIndex((chat) => chat.uid === currentChat)
+		const isRemovingCurrent = currentChat === uid
+
+		const updatedChats = chats.filter((c) => c.uid !== uid)
+		setChats(updatedChats)
+
+		if (isRemovingCurrent) {
+			let newCurrentChat: string | null = null
+
+			// Пытаемся найти подходящий чат для перехода
+			if (updatedChats.length > 0) {
+				// Сначала пробуем следующий чат
+				if (currentIndex < updatedChats.length) {
+					newCurrentChat = updatedChats[currentIndex]?.uid || null
+				}
+				// Если нет - берем предыдущий
+				if (!newCurrentChat && currentIndex > 0) {
+					newCurrentChat = updatedChats[currentIndex - 1]?.uid || null
+				}
+				// Если все еще нет - берем первый
+				if (!newCurrentChat) {
+					newCurrentChat = updatedChats[0]?.uid || null
+				}
+			}
+
+			setCurrentChat(newCurrentChat)
+		}
 	})
 
 	const onCreateChat = makePrivateRequest(async (dto: CreateChatDTO) => {
@@ -47,6 +74,7 @@ export function useChatActions() {
 		const chats = useChatsStore.getState().chats
 
 		setChats([chat, ...chats])
+		setCurrentChat(chat.uid)
 	})
 
 	return {
@@ -0,0 +1,12 @@
+import { create } from 'zustand'
+import { ChatDTO } from '#/entities/chat/types'
+
+interface CurrentChatStore {
+	currentChat: ChatDTO | null
+	setCurrentChat: (chat: ChatDTO | null) => void
+}
+
+export const useCurrentChat = create<CurrentChatStore>((set) => ({
+	currentChat: null,
+	setCurrentChat: (currentChat) => set({ currentChat }),
+}))
@@ -45,8 +45,15 @@ export const ChatButton = forwardRef<HTMLButtonElement, ChatButtonProps>(
 							<button
 								onClick={() => {
 									if (!input.current) return
+
+									const newTitle = input.current.value.trim()
+									if (!newTitle || newTitle === title) {
+										setRename(false)
+										return
+									}
+
 									setRename(false)
-									onRenameChat(uid, input.current.value)
+									onRenameChat(uid, newTitle)
 								}}
 							>
 								<RenameSvg color='#8280FF' width={20} height={22} />
@@ -55,9 +62,7 @@ export const ChatButton = forwardRef<HTMLButtonElement, ChatButtonProps>(
 					/>
 				) : (
 					<div className={c(styles.main, uid === chat && styles.main_active)}>
-						<p
-							className={c(styles.main__text, uid === chat && styles.main__text_active)}
-						>
+						<p className={c(styles.main__text, uid === chat && styles.main__text_active)}>
 							{title}
 						</p>
 
@@ -1,34 +1,43 @@
-  import { create } from 'zustand'
-  import { Message } from '../types'
+import { create } from 'zustand'
+import { Message } from '../types'
 
-  export interface ChatBotMessagesStore {
-    messages: Message[]
-    loading: boolean
-    loaded: boolean
-    setMessages: (messages: Message[]) => void
-    setLoading: (loading: boolean) => void
-    setLoaded: (loaded: boolean) => void
-  }
+export interface ChatBotMessagesStore {
+	messages: Message[]
+	loading: boolean
+	loaded: boolean
+	setMessages: (messages: Message[]) => void
+	setLoading: (loading: boolean) => void
+	setLoaded: (loaded: boolean) => void
+	clearMessages: () => void
+}
 
-  export const useChatBotMessages = create<ChatBotMessagesStore>((set, get) => {
-    function setMessages(messages: Message[]) {
-      set({ ...get(), messages })
-    }
+export const useChatBotMessages = create<ChatBotMessagesStore>((set, get) => {
+	function setMessages(messages: Message[]) {
+		set({ ...get(), messages })
+	}
 
-    function setLoading(loading: boolean) {
-      set({ ...get(), loading })
-    }
+	function setLoading(loading: boolean) {
+		set({ ...get(), loading })
+	}
 
-    function setLoaded(loaded: boolean) {
-      set({ ...get(), loaded })
-    }
+	function setLoaded(loaded: boolean) {
+		set({ ...get(), loaded })
+	}
 
-    return {
-      messages: [],
-      loading: false,
-      loaded: false,
-      setLoaded,
-      setMessages,
-      setLoading,
-    }
-  })
+	function clearMessages() {
+		console.log('Clearing messages...', get().messages)
+
+		set({ ...get(), messages: [] })
+		console.log('Messages after clear:', get().messages)
+	}
+
+	return {
+		messages: [],
+		loading: false,
+		loaded: false,
+		setLoaded,
+		setMessages,
+		setLoading,
+		clearMessages,
+	}
+})
@@ -144,6 +144,6 @@ export function useChatBotPagination() {
 		messagesWithRefs,
 		refScroll,
 		loaded,
-    observer,
+		observer,
 	}
 }
@@ -21,7 +21,13 @@ export const ChatItemActionsPopup = ({ id, setRename, ...props }: ChatItemAction
 	const renamePopup = getPopupById(`rename-${id}`)
 
 	return (
-		<PopupTemplate hasMobileTransform horizontal='right' className={styles.container} id={id} {...props}>
+		<PopupTemplate
+			hasMobileTransform
+			horizontal='right'
+			className={styles.container}
+			id={id}
+			{...props}
+		>
 			<div className={styles.popup}>
 				<button
 					className={styles.popup__button}
@@ -2,7 +2,7 @@ import { create } from 'zustand'
 
 export interface CurrentChatStore {
 	currentChat: string | null
-  setCurrentChat: (currentChat: string | null) => void
+	setCurrentChat: (currentChat: string | null) => void
 }
 
 export const useCurrentChat = create<CurrentChatStore>((set, get) => {
@@ -12,6 +12,6 @@ export const useCurrentChat = create<CurrentChatStore>((set, get) => {
 
 	return {
 		currentChat: null,
-    setCurrentChat
+		setCurrentChat,
 	}
 })
@@ -6,24 +6,24 @@
 	background-color: var(--new-ui-main-color);
 	padding: 0px 16px 10px;
 	height: 100%;
-  overflow: hidden;
+	overflow: hidden;
 
 	@media screen and (max-width: 1000px) {
 		border-radius: 13px;
 		padding: 0px 10px 10px;
-    height: calc(100dvh - 200px);
+		height: calc(100dvh - 200px);
 	}
 
 	&_tags {
 		@media screen and (max-width: 1000px) {
-      height: calc(100dvh - 240px);
+			height: calc(100dvh - 240px);
 		}
 	}
 
-  &__input{
-    position: relative;
-    z-index: 10;
-  }
+	&__input {
+		position: relative;
+		z-index: 10;
+	}
 }
 
 // html[data-theme="dark"] {
@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react'
+import React, { useEffect, useMemo, useState } from 'react'
 import { ChatMessagesList } from '#/widgets/messages'
 
 import BlockedSvg from '#/assets/svg/blocked.svg?react'
@@ -14,6 +14,7 @@ import { useChatBotInput } from '#/features/chat-bot-input'
 import { useChatImageLoad } from '#/features/chat-image-load'
 import { useChatMessageActions } from '#/features/use-chat-message-actions'
 import { ChatWindowContextProvider } from '../model'
+import { useChatBotMessages } from '#/entities/message'
 
 export interface ChatProps {
 	setOpenFiltersMobile: React.Dispatch<React.SetStateAction<boolean>>
@@ -28,13 +29,22 @@ export function AllChatWindow<T>({ setOpenFiltersMobile }: ChatProps) {
 		inference,
 		sendMessage
 	)
+	const { clearMessages } = useChatBotMessages()
+
+	useEffect(() => {
+		return () => {
+			clearMessages()
+		}
+	}, [])
 
 	const { showMessage } = useShowDataStore()
 
 	const requiredTypes = useMemo(() => inputs.filter((p) => p.required).map((p) => p.type), [inputs])
 
 	return (
-		<ChatWindowContextProvider value={{ onSendMessage, file, setFile, setValueInput, valueInput, inputTypes }}>
+		<ChatWindowContextProvider
+			value={{ onSendMessage, file, setFile, setValueInput, valueInput, inputTypes }}
+		>
 			<div className={c(styles.wrap, model && !!model.tags.length && styles.wrap_tags)}>
 				<ChatMessagesList model={model} />
 
@@ -57,6 +67,8 @@ export function AllChatWindow<T>({ setOpenFiltersMobile }: ChatProps) {
 						</div>
 					)}
 				</div>
+
+				<div></div>
 			</div>
 		</ChatWindowContextProvider>
 	)
@@ -7,8 +7,9 @@ import styles from './chats.module.scss'
 import { CommonTooltip } from '#/shared/ui/tooltip'
 import PlusSvg from '#/assets/svg/plus.svg?react'
 import { ChatButton, useChatActions } from '#/entities/chat'
-import { useChatBotParams } from '#/entities/model-entity'
+import { useChatBot, useChatBotParams } from '#/entities/model-entity'
 import { isBottom } from '#/shared/lib/helpers/refs'
+import { useChatBotMessages } from '#/entities/message'
 
 export interface ChatProps extends HtmlHTMLAttributes<HTMLDivElement> {}
 
@@ -1,22 +1,44 @@
+.observed {
+	width: 100%;
+	height: 1000px;
+	position: absolute;
+	left: 0;
+	top: 0;
+}
 
+.list {
+	height: 100%;
 
-.observed{
-  width: 100%;
-  height: 1000px;
-  position: absolute;
-  left: 0;
-  top: 0;
+	&__scroll {
+		padding-top: 30px;
+		text-align: center;
+	}
 }
 
-.list{
-  height: 100%;
+.preview {
+	padding-top: 30px;
+}
 
-  &__scroll{
-    padding-top: 30px;
-    text-align: center;
-  }
+.messages {
+	position: relative;
+	height: 100%;
 }
 
-.preview{
-  padding-top: 30px;
-}
\ No newline at end of file
+.bottom {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: var(--air-color);
+	border-radius: 100%;
+	width: 36px;
+	position: absolute;
+	bottom: 20px;
+	left: 50%;
+	transform: translateY(-50%);
+	height: 36px;
+
+  svg{
+    position: relative;
+    top: 1px;
+  }
+}
@@ -16,6 +16,7 @@ import { ImageModal } from '#/features/image-modal'
 import { useChatMessageImage } from '../model/use-chat-message-image'
 import { useModelInputStore } from '#/features/model-input/model'
 import { useChatWindowContext } from '#/widgets/chat-window/model'
+import ArrowDownSvg from '#/assets/svg/arrow-down.svg?react'
 
 interface IMessagesList {
 	model: Model | null
@@ -23,9 +24,7 @@ interface IMessagesList {
 
 export const ChatMessagesList: React.FC<IMessagesList> = memo(({ model }) => {
 	const { query, pathname } = useRouter()
-
 	const { currentSrc, setCurrentSrc, onlyImageMessages } = useChatMessageImage()
-
 	const { setValueInput } = useChatWindowContext()
 
 	const {
@@ -60,7 +59,7 @@ export const ChatMessagesList: React.FC<IMessagesList> = memo(({ model }) => {
 	}
 
 	return (
-		<>
+		<div className={styles.messages}>
 			<ClientOnly>
 				{createPortal(
 					<ImageModal
@@ -121,6 +120,10 @@ export const ChatMessagesList: React.FC<IMessagesList> = memo(({ model }) => {
 					</div>
 				</CSSTransition>
 			</SwitchTransition>
-		</>
+
+			<button className={styles.bottom}>
+				<ArrowDownSvg color='white' width={15} height={15} />
+			</button>
+		</div>
 	)
 })