diff --git a/frontend/src/resources/css/_chat.scss b/frontend/src/resources/css/_chat.scss
index 1b8f8c9..af0e905 100644
--- a/frontend/src/resources/css/_chat.scss
+++ b/frontend/src/resources/css/_chat.scss
@@ -420,6 +420,14 @@
     min-width: 160px;
     z-index: 1000;
     
+    &.entering {
+        animation: fadeInDown 0.2s ease forwards;
+    }
+    
+    &.closing {
+        animation: fadeOutUp 0.2s ease forwards;
+    }
+    
     .context-menu-item {
         display: flex;
         align-items: center;
diff --git a/frontend/src/ui/components/chat/ChatMessages.tsx b/frontend/src/ui/components/chat/ChatMessages.tsx
index 4bd1e69..e718c6c 100644
--- a/frontend/src/ui/components/chat/ChatMessages.tsx
+++ b/frontend/src/ui/components/chat/ChatMessages.tsx
@@ -6,12 +6,10 @@ 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, useEffect } from "react";
 import { delay } from "../../../utils/utils";
 import { request } from "../../../websocket";
 
-
-
 export function ChatMessages() {
     const { messages } = useChat();
     const { user } = useAppState();
@@ -26,6 +24,44 @@ export function ChatMessages() {
         position: { x: 0, y: 0 }
     });
 
+    // Effect to handle clicks outside the context menu
+    useEffect(() => {
+        const handleClickOutside = (event: MouseEvent) => {
+            if (contextMenu.isOpen) {
+                // Check if the click is on a context menu element
+                const target = event.target as Element;
+                if (!target.closest('.context-menu')) {
+                    handleContextMenuClose();
+                }
+            }
+        };
+
+        const handleKeyDown = (event: KeyboardEvent) => {
+            if (event.key === 'Escape' && contextMenu.isOpen) {
+                handleContextMenuClose();
+            }
+        };
+
+        const handleWindowBlur = () => {
+            // Close context menu when browser window loses focus
+            if (contextMenu.isOpen) {
+                handleContextMenuClose();
+            }
+        };
+
+        // Add event listeners
+        document.addEventListener('mousedown', handleClickOutside);
+        document.addEventListener('keydown', handleKeyDown);
+        window.addEventListener('blur', handleWindowBlur);
+
+        // Cleanup
+        return () => {
+            document.removeEventListener('mousedown', handleClickOutside);
+            document.removeEventListener('keydown', handleKeyDown);
+            window.removeEventListener('blur', handleWindowBlur);
+        };
+    }, [contextMenu.isOpen]);
+
     const handleProfileClick = async (username: string) => {
         if (!user.authToken) return;
         
@@ -120,19 +156,9 @@ export function ChatMessages() {
         }
     };
 
-    // Close context menu when clicking outside
-    const handleClickOutside = (e: React.MouseEvent) => {
-        if (contextMenu.isOpen) {
-            // Only close if clicking on the chat messages container, not on the context menu itself
-            if (e.target === e.currentTarget) {
-                handleContextMenuClose();
-            }
-        }
-    };
-
     return (
         <>
-            <div className="chat-messages" id="chat-messages" onClick={handleClickOutside}>
+            <div className="chat-messages" id="chat-messages">
                 {messages.map((message) => (
                     <Message
                         key={message.id}
diff --git a/frontend/src/ui/components/chat/MessageContextMenu.tsx b/frontend/src/ui/components/chat/MessageContextMenu.tsx
index 7b09729..b7228f3 100644
--- a/frontend/src/ui/components/chat/MessageContextMenu.tsx
+++ b/frontend/src/ui/components/chat/MessageContextMenu.tsx
@@ -33,6 +33,7 @@ export function MessageContextMenu({
     // Internal state for dialogs
     const [editDialogOpen, setEditDialogOpen] = useState(false);
     const [replyDialogOpen, setReplyDialogOpen] = useState(false);
+    const [isClosing, setIsClosing] = useState(false);
     
     const handleAction = (action: string) => {
         console.log("Context menu action triggered:", action);
@@ -48,12 +49,20 @@ export function MessageContextMenu({
             case "delete":
                 if (isAuthor) {
                     onDelete(message);
-                    onClose();
+                    handleClose();
                 }
                 break;
         }
     };
 
+    const handleClose = () => {
+        setIsClosing(true);
+        // Wait for animation to complete before calling onClose
+        setTimeout(() => {
+            onClose();
+        }, 200); // Match the animation duration from _animations.scss
+    };
+
     const handleEditSave = (messageId: number, newContent: string) => {
         // Create a temporary message object with the updated content
         const updatedMessage = { ...message, content: newContent };
@@ -71,7 +80,7 @@ export function MessageContextMenu({
     return (
         <>
             <div 
-                className="context-menu"
+                className={`context-menu ${isClosing ? 'closing' : 'entering'}`}
                 style={{
                     position: "fixed",
                     display: "block",