diff --git a/src/Components/Common/RichTextEditor/RichTextEditor.tsx b/src/Components/Common/RichTextEditor/RichTextEditor.tsx
index ff1d3e41ea9..cb693e4e870 100644
--- a/src/Components/Common/RichTextEditor/RichTextEditor.tsx
+++ b/src/Components/Common/RichTextEditor/RichTextEditor.tsx
@@ -517,7 +517,7 @@ const RichTextEditor: React.FC<RichTextEditorProps> = ({
         newFile,
         "PUT",
         { "Content-Type": file.type },
-        (xhr: XMLHttpRequest) => {
+        async (xhr: XMLHttpRequest) => {
           if (xhr.status >= 200 && xhr.status < 300) {
             Notification.Success({
               msg: "File Uploaded Successfully",
diff --git a/src/Components/Facility/DoctorNote.tsx b/src/Components/Facility/DoctorNote.tsx
index ffcb5dcc558..fe7ccc278f0 100644
--- a/src/Components/Facility/DoctorNote.tsx
+++ b/src/Components/Facility/DoctorNote.tsx
@@ -27,7 +27,7 @@ const DoctorNote = (props: DoctorNoteProps) => {
 
   return (
     <div
-      className="mt-4 flex h-[600px] grow flex-col-reverse overflow-y-scroll bg-white sm:ml-2"
+      className="mt-4 flex h-[500px] grow flex-col-reverse overflow-y-scroll bg-white sm:ml-2"
       id="patient-notes-list"
     >
       {state.notes.length ? (
diff --git a/src/Components/Facility/PatientConsultationNotesList.tsx b/src/Components/Facility/PatientConsultationNotesList.tsx
index d1681f65367..8165eacb49d 100644
--- a/src/Components/Facility/PatientConsultationNotesList.tsx
+++ b/src/Components/Facility/PatientConsultationNotesList.tsx
@@ -80,6 +80,10 @@ const PatientConsultationNotesList = (props: PatientNotesProps) => {
     fetchNotes();
   }, [thread]);
 
+  useEffect(() => {
+    setThreadViewNote?.("");
+  }, [thread, mode]);
+
   useEffect(() => {
     setReload?.(true);
   }, []);
diff --git a/src/Components/Facility/PatientNoteCard.tsx b/src/Components/Facility/PatientNoteCard.tsx
index 34bb7b70f3e..70b251208df 100644
--- a/src/Components/Facility/PatientNoteCard.tsx
+++ b/src/Components/Facility/PatientNoteCard.tsx
@@ -304,7 +304,10 @@ const PatientNoteCard = ({
                     >
                       <div
                         className="flex h-full w-full flex-col items-center justify-center p-2"
-                        onClick={() => loadFile(file.external_id, note.id)}
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          loadFile(file.external_id, note.id);
+                        }}
                       >
                         <CareIcon
                           icon="l-file"
@@ -369,7 +372,9 @@ const PatientNoteCard = ({
                       <p className="text-sm font-medium text-secondary-500">
                         Note
                       </p>
-                      <p className="text-sm text-secondary-900">{edit.note}</p>
+                      <div className="text-sm text-secondary-900">
+                        <MarkdownPreview markdown={edit.note} />
+                      </div>
                     </div>
                   </div>
                 );
diff --git a/src/Components/Facility/PatientNotesDetailedView.tsx b/src/Components/Facility/PatientNotesDetailedView.tsx
index 7eccceb1624..f566eb4c625 100644
--- a/src/Components/Facility/PatientNotesDetailedView.tsx
+++ b/src/Components/Facility/PatientNotesDetailedView.tsx
@@ -100,7 +100,7 @@ const PatientNotesDetailedView = (props: Props) => {
   }
 
   return (
-    <div className="flex w-[500px] flex-col overflow-hidden rounded-lg border border-gray-300 bg-white p-3">
+    <div className="flex w-[500px] flex-col overflow-hidden rounded-lg border border-gray-300 bg-white px-3 pt-2">
       {state && (
         <div className="flex flex-col">
           <div className="flex-1">
@@ -121,15 +121,17 @@ const PatientNotesDetailedView = (props: Props) => {
                 allowReply={false}
               />
             </div>
-            {state.replies.length > 0 && (
-              <div className="mr-4 mt-1 flex items-center justify-end text-sm text-gray-500">
-                {state.replies.length}{" "}
-                {state.replies.length > 1 ? "replies" : "reply"}
-              </div>
-            )}
-            <h4 className="ml-2 text-lg text-slate-600">Replies</h4>
+            <div className="flex items-center justify-between p-2">
+              <h4 className="ml-2 text-lg text-slate-600">Replies</h4>
+              {state.replies.length > 0 && (
+                <div className="mr-4 mt-1 flex items-center justify-end text-sm text-gray-500">
+                  {state.replies.length}{" "}
+                  {state.replies.length > 1 ? "replies" : "reply"}
+                </div>
+              )}
+            </div>
             {
-              <div className="flex max-h-[430px] flex-col-reverse overflow-x-hidden overflow-y-scroll">
+              <div className="flex max-h-[250px] flex-col-reverse overflow-x-hidden overflow-y-scroll pl-2">
                 {state.replies.map((reply) => (
                   <DoctorNoteReplyPreviewCard
                     key={reply.id}