diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index 6f33ad1ddccdf..0b5f67f5aa330 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -27,7 +27,6 @@ import { callbacks } from '../../../../callbacks';
 import { hasAllPermission, hasRole } from '../../../../authorization';
 import { ChatMessages } from '../../lib/chatMessages';
 import { fileUpload } from '../../lib/fileUpload';
-import { Markdown } from '../../../../markdown/client';
 import './room.html';
 import { getCommonRoomEvents } from './lib/getCommonRoomEvents';
 
@@ -258,8 +257,7 @@ Template.roomOld.helpers({
 	},
 
 	announcement() {
-		const announcement = Template.instance().state.get('announcement');
-		return announcement ? Markdown.parse(announcement).replace(/^<p>|<\/p>$/, '') : undefined;
+		return Template.instance().state.get('announcement');
 	},
 
 	announcementDetails() {
diff --git a/client/views/room/Announcement/Announcement.js b/client/views/room/Announcement/Announcement.js
index d647a46ef5abf..3036c95d449c9 100644
--- a/client/views/room/Announcement/Announcement.js
+++ b/client/views/room/Announcement/Announcement.js
@@ -9,11 +9,15 @@ import { useSetModal } from '../../../contexts/ModalContext';
 import MarkdownText from '../../../components/MarkdownText';
 
 export const Announcement = ({ children, onClickOpen }) => {
-	const clickable = css`
+	const announcementBar = css`
 		background-color: ${ colors.b200 };
 		color: ${ colors.b600 };
 		cursor: pointer;
 		transition: transform 0.2s ease-out;
+		a{
+			color: ${ colors.b600 } !important;
+			text-decoration: underline !important;
+		}
 		> * {
 			flex: auto;
 		}
@@ -23,13 +27,17 @@ export const Announcement = ({ children, onClickOpen }) => {
 			color: ${ colors.b800 };
 		}`;
 
-	return <Box onClick={onClickOpen} height='x40' alignItems='center' display='flex' fontScale='p2' textAlign='center' className={clickable}><Box withTruncatedText w='none'>{children}</Box></Box>;
+	return <Box onClick={onClickOpen} height='x40' pi='x24' alignItems='center' display='flex' fontScale='p2' textAlign='center' className={announcementBar}><Box withTruncatedText w='none'>{children}</Box></Box>;
 };
 
 export default ({ announcement, announcementDetails }) => {
 	const setModal = useSetModal();
 	const closeModal = useMutableCallback(() => setModal());
 	const handleClick = () => {
+		if (window.getSelection().toString() !== '') {
+			return;
+		}
+
 		announcementDetails ? announcementDetails() : setModal(<AnnouncementModal onClose={closeModal}>{announcement}</AnnouncementModal>);
 	};