diff --git a/src/common/features/chats/components/_chat-message-item.scss b/src/common/features/chats/components/_chat-message-item.scss
new file mode 100644
index 00000000000..3cfd6fd332b
--- /dev/null
+++ b/src/common/features/chats/components/_chat-message-item.scss
@@ -0,0 +1,5 @@
+.chat-message-item-sender {
+  .markdown-external-link {
+    @apply text-white opacity-75 hover:opacity-100;
+  }
+}
\ No newline at end of file
diff --git a/src/common/features/chats/components/chat-message-item.tsx b/src/common/features/chats/components/chat-message-item.tsx
index 42712492754..5d6b75d917b 100644
--- a/src/common/features/chats/components/chat-message-item.tsx
+++ b/src/common/features/chats/components/chat-message-item.tsx
@@ -21,6 +21,7 @@ import {
 } from "@ecency/ns-query";
 import { format } from "date-fns";
 import { useInViewport } from "react-in-viewport";
+import "./_chat-message-item.scss";
 
 interface Props {
   type: "sender" | "receiver";
@@ -94,9 +95,9 @@ export function ChatMessageItem({
     <div key={message.id} data-message-id={message.id} ref={ref}>
       <div
         className={classNameObject({
-          "flex gap-1 px-4 w-full": true,
-          "justify-start": type === "receiver",
-          "justify-end": type === "sender",
+          "chat-message-item flex gap-1 px-4 w-full": true,
+          "justify-start chat-message-item-receiver": type === "receiver",
+          "justify-end chat-message-item-sender": type === "sender",
           failed: isFailed,
           sending: isSending,
           "mb-4": showDate,
diff --git a/src/common/features/chats/components/chat-popup/index.tsx b/src/common/features/chats/components/chat-popup/index.tsx
index 523c53bfcbe..497ffdf8f8c 100644
--- a/src/common/features/chats/components/chat-popup/index.tsx
+++ b/src/common/features/chats/components/chat-popup/index.tsx
@@ -74,7 +74,11 @@ export const ChatPopUp = () => {
 
   // Show or hide the popup if current pathname was changed or user changed
   useEffect(() => {
-    setShow(!routerLocation.pathname.match("/chats") && !!activeUser);
+    setShow(
+      !routerLocation.pathname.match("/chats") &&
+        !routerLocation.pathname.match("/submit") &&
+        !!activeUser
+    );
   }, [routerLocation, activeUser]);
 
   useEffect(() => {