diff --git a/src/lib/components/channel/Messages/Message/UserStatus.svelte b/src/lib/components/channel/Messages/Message/UserStatus.svelte
index 5d3fa734fa..07efa89c43 100644
--- a/src/lib/components/channel/Messages/Message/UserStatus.svelte
+++ b/src/lib/components/channel/Messages/Message/UserStatus.svelte
@@ -83,7 +83,7 @@
 					}}
 				>
 					<div>
-						<ChatBubbleOval class="size-4" />
+						<ChatBubbleOval className="size-4" />
 					</div>
 
 					<div class="font-medium">
diff --git a/src/lib/components/common/Modal.svelte b/src/lib/components/common/Modal.svelte
index 16c36fa403..99a754745c 100644
--- a/src/lib/components/common/Modal.svelte
+++ b/src/lib/components/common/Modal.svelte
@@ -59,7 +59,10 @@
 		document.body.appendChild(modalElement);
 		focusTrap = FocusTrap.createFocusTrap(modalElement, {
 			allowOutsideClick: (e) => {
-				return e.target.closest('[data-sonner-toast]') !== null;
+				return (
+					e.target.closest('[data-sonner-toast]') !== null ||
+					e.target.closest('.modal-content') === null
+				);
 			}
 		});
 		focusTrap.activate();