diff --git a/src/views/contacts/Contacts.tsx b/src/views/contacts/Contacts.tsx
index 000ef698..c3dba3f1 100644
--- a/src/views/contacts/Contacts.tsx
+++ b/src/views/contacts/Contacts.tsx
@@ -143,7 +143,7 @@ export const Contacts = () => {
           </div>
         </div>
 
-        <div className="hidden w-full flex-col gap-2 md:flex">
+        <div className="hidden h-[calc(100dvh-130px)] w-full flex-col gap-2 overflow-y-auto md:flex">
           {contacts.length ? (
             contacts.map(c => <ContactCard key={c.id} contact={c} />)
           ) : (
diff --git a/src/views/contacts/Messages.tsx b/src/views/contacts/Messages.tsx
index 64540d36..8f0fedfb 100644
--- a/src/views/contacts/Messages.tsx
+++ b/src/views/contacts/Messages.tsx
@@ -117,7 +117,10 @@ export const Messages = () => {
       className="relative flex h-[calc(100dvh-170px)] flex-col overflow-y-auto rounded-xl bg-muted/50 md:h-[calc(100dvh-86px)] lg:col-span-3"
     >
       {!!currentContact?.user ? (
-        <Badge variant="secondary" className="absolute right-3 top-3">
+        <Badge
+          variant="secondary"
+          className="sticky left-full top-3 mr-3 w-fit"
+        >
           {currentContact.user}
         </Badge>
       ) : null}