diff --git a/frontend/src/ui/components/chat/ChatMessages.tsx b/frontend/src/ui/components/chat/ChatMessages.tsx
index 45aca19..1ba1d4d 100644
--- a/frontend/src/ui/components/chat/ChatMessages.tsx
+++ b/frontend/src/ui/components/chat/ChatMessages.tsx
@@ -6,15 +6,16 @@ import type { UserProfile } from "../../../core/types";
 import { UserProfileDialog } from "./UserProfileDialog";
 import { MessageContextMenu, type ContextMenuState } from "./MessageContextMenu";
 import { fetchUserProfile } from "../../api/profileApi";
-import { useState } from "react";
+import { useState, type ReactNode } from "react";
 import { delay } from "../../../utils/utils";
 import { request } from "../../../websocket";
 
 interface ChatMessagesProps {
     messages?: MessageType[];
+    children?: ReactNode;
 }
 
-export function ChatMessages({ messages: propMessages }: ChatMessagesProps) {
+export function ChatMessages({ messages: propMessages, children }: ChatMessagesProps) {
     const { messages: hookMessages } = useChat();
     const { user } = useAppState();
     
@@ -137,6 +138,7 @@ export function ChatMessages({ messages: propMessages }: ChatMessagesProps) {
                         isLoadingProfile={isLoadingProfile}
                     />
                 ))}
+                {children}
             </div>
             
             <UserProfileDialog
diff --git a/frontend/src/ui/components/chat/MessagePanelRenderer.tsx b/frontend/src/ui/components/chat/MessagePanelRenderer.tsx
index 4887c9c..bf052de 100644
--- a/frontend/src/ui/components/chat/MessagePanelRenderer.tsx
+++ b/frontend/src/ui/components/chat/MessagePanelRenderer.tsx
@@ -1,6 +1,5 @@
 import { useState, useEffect, useRef } from "react";
 import { MessagePanel, type MessagePanelState } from "../../panels/MessagePanel";
-import { ChatMainHeader } from "./ChatMainHeader";
 import { ChatMessages } from "./ChatMessages";
 import { ChatInputWrapper } from "./ChatInputWrapper";
 import defaultAvatar from "../../../resources/images/default-avatar.png";
@@ -105,9 +104,9 @@ export function MessagePanelRenderer({ panel, isChatSwitching }: MessagePanelRen
                         <a href="#" id="hide-chat">Свернуть чат</a>
                     </div>
                 </div>
-                
-                <div className="chat-messages" id="chat-messages">
-                    {panelState.isLoading ? (
+
+                {panelState.isLoading ? (
+                    <div className="chat-messages" id="chat-messages">
                         <div style={{ 
                             display: "flex", 
                             justifyContent: "center", 
@@ -117,13 +116,12 @@ export function MessagePanelRenderer({ panel, isChatSwitching }: MessagePanelRen
                         }}>
                             Loading messages...
                         </div>
-                    ) : (
-                        <>
-                            <ChatMessages messages={panelState.messages} />
-                            <div ref={messagesEndRef} />
-                        </>
-                    )}
-                </div>
+                    </div>
+                ): (
+                    <ChatMessages messages={panelState.messages}>
+                        <div ref={messagesEndRef} />
+                    </ChatMessages>
+                )}
                 
                 <ChatInputWrapper onSendMessage={panel.handleSendMessage} />
             </div>