diff --git a/frontend/src/components/cytology/CytologyCaseView.js b/frontend/src/components/cytology/CytologyCaseView.js
index fd093a9164..c2c23834a3 100644
--- a/frontend/src/components/cytology/CytologyCaseView.js
+++ b/frontend/src/components/cytology/CytologyCaseView.js
@@ -146,7 +146,9 @@ function CytologyCaseView() {
   const [reportParams, setReportParams] = useState({
     0: {
       submited: false,
-    }});
+      reportLink: "",
+    },
+  });
 
   const handleConfirm = () => {
     var diagnosis = { ...pathologySampleInfo.diagnosis };
@@ -183,7 +185,7 @@ function CytologyCaseView() {
     }
   }
 
-  const reportStatus = (pdfGenerated, index) => {
+  const reportStatus = async (pdfGenerated, blob, index) => {
     setNotificationVisible(true);
     setLoadingReport(false);
     if (pdfGenerated) {
@@ -197,7 +199,18 @@ function CytologyCaseView() {
         params[index] = {};
       }
       params[index].submited = true;
+      params[index].reportLink = window.URL.createObjectURL(blob, {
+        type: "application/pdf",
+      });
       setReportParams(params);
+
+      var newReports = [...pathologySampleInfo.reports];
+      let encodedFile = await toBase64(blob);
+      newReports[index].base64Image = encodedFile;
+      setPathologySampleInfo({
+        ...pathologySampleInfo,
+        reports: newReports,
+      });
     } else {
       setNotificationBody({
         kind: NotificationKinds.error,
@@ -868,7 +881,7 @@ function CytologyCaseView() {
                         iconDescription="file upload"
                         multiple={false}
                         accept={["image/jpeg", "image/png", "application/pdf"]}
-                        disabled={false}
+                        disabled={reportParams[index]?.submited}
                         name=""
                         buttonKind="primary"
                         size="lg"
@@ -899,30 +912,49 @@ function CytologyCaseView() {
                         }
                       </h6>
                     </Column>
-                    <Column lg={2} md={1} sm={2}>
-                      {pathologySampleInfo.reports[index].image && (
-                        <>
-                          <Button
-                            onClick={() => {
-                              var win = window.open();
-                              win.document.write(
-                                '<iframe src="' +
-                                  report.fileType +
-                                  ";base64," +
-                                  report.image +
-                                  '" frameborder="0" style="border:0; top:0px; left:0px; bottom:0px; right:0px; width:100%; height:100%;" allowfullscreen></iframe>',
-                              );
-                            }}
-                          >
-                            <Launch />{" "}
-                            <FormattedMessage id="pathology.label.view" />
-                          </Button>
-                        </>
-                      )}
-                    </Column>
+
+                    {pathologySampleInfo.reports[index].image && (
+                      <>
+                        {!reportParams[index]?.submited && (
+                          <Column lg={2} md={1} sm={2}>
+                            <Button
+                              onClick={() => {
+                                var win = window.open();
+                                win.document.write(
+                                  '<iframe src="' +
+                                    report.fileType +
+                                    ";base64," +
+                                    report.image +
+                                    '" frameborder="0" style="border:0; top:0px; left:0px; bottom:0px; right:0px; width:100%; height:100%;" allowfullscreen></iframe>',
+                                );
+                              }}
+                            >
+                              <Launch />{" "}
+                              <FormattedMessage id="pathology.label.view" />
+                            </Button>
+                          </Column>
+                        )}
+                      </>
+                    )}
+
+                    {reportParams[index]?.submited && (
+                      <Column lg={2} md={1} sm={2}>
+                        <Button
+                          onClick={() => {
+                            window.open(
+                              reportParams[index]?.reportLink,
+                              "_blank",
+                            );
+                          }}
+                        >
+                          <Launch />{" "}
+                          <FormattedMessage id="pathology.label.view" />
+                        </Button>
+                      </Column>
+                    )}
                     <Column lg={3} md={2} sm={2}>
                       <Button
-                       disabled={reportParams[index]?.submited}
+                        disabled={reportParams[index]?.submited}
                         id={"generate_report_" + index}
                         onClick={(e) => {
                           setLoadingReport(true);
@@ -933,7 +965,7 @@ function CytologyCaseView() {
                           postToOpenElisServerForPDF(
                             "/rest/ReportPrint",
                             JSON.stringify(form),
-                            (e) => reportStatus(e, index),
+                            (e, blob) => reportStatus(e, blob, index),
                           );
                         }}
                       >
diff --git a/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js b/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
index fbe44ec2e2..4671b5bbbb 100644
--- a/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
+++ b/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
@@ -139,6 +139,7 @@ function ImmunohistochemistryCaseView() {
       numberOfcancerNuclei: "",
       toggled: false,
       submited: false,
+      reportLink: "",
     },
   });
 
@@ -167,7 +168,7 @@ function ImmunohistochemistryCaseView() {
     }
   }
 
-  const reportStatus = (pdfGenerated, index) => {
+  const reportStatus = async (pdfGenerated, blob, index) => {
     setNotificationVisible(true);
     setLoadingReport(false);
     if (pdfGenerated) {
@@ -182,7 +183,19 @@ function ImmunohistochemistryCaseView() {
       }
       params[index].submited = true;
       params[index].toggled = false;
+      params[index].reportLink = window.URL.createObjectURL(blob, {
+        type: "application/pdf",
+      });
       setReportParams(params);
+
+      var newReports = [...immunohistochemistrySampleInfo.reports];
+      let encodedFile = await toBase64(blob);
+      newReports[index].base64Image = encodedFile;
+
+      setImmunohistochemistrySampleInfo({
+        ...immunohistochemistrySampleInfo,
+        reports: newReports,
+      });
     } else {
       setNotificationBody({
         kind: NotificationKinds.error,
@@ -247,7 +260,6 @@ function ImmunohistochemistryCaseView() {
                     id={"erIntensity_" + index}
                     name="status"
                     labelText=""
-
                     value={reportParams[index]?.erIntensity}
                     onChange={(e) => {
                       var params = { ...reportParams };
@@ -509,7 +521,7 @@ function ImmunohistochemistryCaseView() {
                   <FormattedMessage id="immunohistochemistry.label.molecularType" />
                 </Column>
                 <Column lg={13} md={8} sm={4}>
-                   <Select
+                  <Select
                     id={"molecularSubType_" + index}
                     name="molecularSubType"
                     labelText=""
@@ -1128,7 +1140,7 @@ function ImmunohistochemistryCaseView() {
                             "image/png",
                             "application/pdf",
                           ]}
-                          disabled={false}
+                          disabled={reportParams[index]?.submited}
                           name=""
                           buttonKind="primary"
                           size="lg"
@@ -1161,31 +1173,49 @@ function ImmunohistochemistryCaseView() {
                           }
                         </h6>
                       </Column>
-                      <Column lg={2} md={1} sm={2}>
-                        {immunohistochemistrySampleInfo.reports[index]
-                          .image && (
-                          <>
-                            <Button
-                              onClick={() => {
-                                var win = window.open();
-                                win.document.write(
-                                  '<iframe src="' +
-                                    report.fileType +
-                                    ";base64," +
-                                    report.image +
-                                    '" frameborder="0" style="border:0; top:0px; left:0px; bottom:0px; right:0px; width:100%; height:100%;" allowfullscreen></iframe>',
-                                );
-                              }}
-                            >
-                              <Launch />{" "}
-                              <FormattedMessage id="pathology.label.view" />
-                            </Button>
-                          </>
-                        )}
-                      </Column>
+
+                      {immunohistochemistrySampleInfo.reports[index].image && (
+                        <>
+                          {!reportParams[index]?.submited && (
+                            <Column lg={2} md={1} sm={2}>
+                              <Button
+                                onClick={() => {
+                                  var win = window.open();
+                                  win.document.write(
+                                    '<iframe src="' +
+                                      report.fileType +
+                                      ";base64," +
+                                      report.image +
+                                      '" frameborder="0" style="border:0; top:0px; left:0px; bottom:0px; right:0px; width:100%; height:100%;" allowfullscreen></iframe>',
+                                  );
+                                }}
+                              >
+                                <Launch />{" "}
+                                <FormattedMessage id="pathology.label.view" />
+                              </Button>
+                            </Column>
+                          )}
+                        </>
+                      )}
+                      {reportParams[index]?.submited && (
+                        <Column lg={2} md={1} sm={2}>
+                          <Button
+                            onClick={() => {
+                              window.open(
+                                reportParams[index]?.reportLink,
+                                "_blank")
+          
+                            }}
+                          >
+                            <Launch />{" "}
+                            <FormattedMessage id="pathology.label.view" />
+                          </Button>
+                        </Column>
+                      )}
+
                       <Column lg={3} md={2} sm={2}>
                         <Button
-                         disabled={reportParams[index]?.submited}
+                          disabled={reportParams[index]?.submited}
                           onClick={(e) => {
                             setLoadingReport(true);
                             const form = {
@@ -1215,7 +1245,7 @@ function ImmunohistochemistryCaseView() {
                             postToOpenElisServerForPDF(
                               "/rest/ReportPrint",
                               JSON.stringify(form),
-                              (e) => reportStatus(e, index),
+                              (e, blob) => reportStatus(e, blob, index),
                             );
                           }}
                         >
diff --git a/frontend/src/components/pathology/PathologyCaseView.js b/frontend/src/components/pathology/PathologyCaseView.js
index 88ea759801..94f8aa495a 100644
--- a/frontend/src/components/pathology/PathologyCaseView.js
+++ b/frontend/src/components/pathology/PathologyCaseView.js
@@ -128,7 +128,9 @@ function PathologyCaseView() {
   const [reportParams, setReportParams] = useState({
     0: {
       submited: false,
-    }});
+      reportLink: "",
+    },
+  });
 
   async function displayStatus(response) {
     var body = await response.json();
@@ -154,7 +156,7 @@ function PathologyCaseView() {
     }
   }
 
-  const reportStatus = (pdfGenerated, index) => {
+  const reportStatus = async (pdfGenerated, blob, index) => {
     setNotificationVisible(true);
     setLoadingReport(false);
     if (pdfGenerated) {
@@ -168,7 +170,18 @@ function PathologyCaseView() {
         params[index] = {};
       }
       params[index].submited = true;
+      params[index].reportLink = window.URL.createObjectURL(blob, {
+        type: "application/pdf",
+      });
       setReportParams(params);
+
+      var newReports = [...pathologySampleInfo.reports];
+      let encodedFile = await toBase64(blob);
+      newReports[index].base64Image = encodedFile;
+      setPathologySampleInfo({
+        ...pathologySampleInfo,
+        reports: newReports,
+      });
     } else {
       setNotificationBody({
         kind: NotificationKinds.error,
@@ -545,7 +558,7 @@ function PathologyCaseView() {
                         iconDescription="file upload"
                         multiple={false}
                         accept={["image/jpeg", "image/png", "application/pdf"]}
-                        disabled={false}
+                        disabled={reportParams[index]?.submited}
                         name=""
                         buttonKind="primary"
                         size="lg"
@@ -572,30 +585,48 @@ function PathologyCaseView() {
                         <FormattedMessage id="pathology.label.report" />
                       </h6>
                     </Column>
-                    <Column lg={2} md={1} sm={2}>
-                      {pathologySampleInfo.reports[index].image && (
-                        <>
-                          <Button
-                            onClick={() => {
-                              var win = window.open();
-                              win.document.write(
-                                '<iframe src="' +
-                                  report.fileType +
-                                  ";base64," +
-                                  report.image +
-                                  '" frameborder="0" style="border:0; top:0px; left:0px; bottom:0px; right:0px; width:100%; height:100%;" allowfullscreen></iframe>',
-                              );
-                            }}
-                          >
-                            <Launch />{" "}
-                            <FormattedMessage id="pathology.label.view" />
-                          </Button>
-                        </>
-                      )}
-                    </Column>
+                    {pathologySampleInfo.reports[index].image && (
+                      <>
+                        {!reportParams[index]?.submited && (
+                          <Column lg={2} md={1} sm={2}>
+                            <Button
+                              onClick={() => {
+                                var win = window.open();
+                                win.document.write(
+                                  '<iframe src="' +
+                                    report.fileType +
+                                    ";base64," +
+                                    report.image +
+                                    '" frameborder="0" style="border:0; top:0px; left:0px; bottom:0px; right:0px; width:100%; height:100%;" allowfullscreen></iframe>',
+                                );
+                              }}
+                            >
+                              <Launch />{" "}
+                              <FormattedMessage id="pathology.label.view" />
+                            </Button>
+                          </Column>
+                        )}
+                      </>
+                    )}
+
+                    {reportParams[index]?.submited && (
+                      <Column lg={2} md={1} sm={2}>
+                        <Button
+                          onClick={() => {
+                            window.open(
+                              reportParams[index]?.reportLink,
+                              "_blank",
+                            );
+                          }}
+                        >
+                          <Launch />{" "}
+                          <FormattedMessage id="pathology.label.view" />
+                        </Button>
+                      </Column>
+                    )}
                     <Column lg={3} md={2} sm={2}>
                       <Button
-                       disabled={reportParams[index]?.submited}
+                        disabled={reportParams[index]?.submited}
                         onClick={(e) => {
                           setLoadingReport(true);
                           const form = {
@@ -605,7 +636,7 @@ function PathologyCaseView() {
                           postToOpenElisServerForPDF(
                             "/rest/ReportPrint",
                             JSON.stringify(form),
-                            (e) => reportStatus(e, index),
+                            (e, blob) => reportStatus(e, blob, index),
                           );
                         }}
                       >
diff --git a/frontend/src/components/utils/Utils.js b/frontend/src/components/utils/Utils.js
index b317a57154..e85d4817bc 100644
--- a/frontend/src/components/utils/Utils.js
+++ b/frontend/src/components/utils/Utils.js
@@ -126,7 +126,7 @@ export const getFromOpenElisServerSync = (endPoint, callback) => {
   callback(JSON.parse(request.response));
 };
 
-export const postToOpenElisServerForPDF = (endPoint, payLoad ,callback) => {
+export const postToOpenElisServerForPDF = (endPoint, payLoad, callback) => {
   fetch(
     config.serverBaseUrl + endPoint,
 
@@ -143,7 +143,7 @@ export const postToOpenElisServerForPDF = (endPoint, payLoad ,callback) => {
   )
     .then((response) => response.blob())
     .then((blob) => {
-      callback(true)
+      callback(true, blob);
       let link = document.createElement("a");
       link.href = window.URL.createObjectURL(blob, { type: "application/pdf" });
       link.target = "_blank";
@@ -152,7 +152,7 @@ export const postToOpenElisServerForPDF = (endPoint, payLoad ,callback) => {
       document.body.removeChild(link);
     })
     .catch((error) => {
-      callback(false)
+      callback(false);
       console.log(error);
     });
 };
diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
index d1fb29be80..32458d6495 100644
--- a/frontend/src/languages/en.json
+++ b/frontend/src/languages/en.json
@@ -102,7 +102,7 @@
     "pathology.label.slide" : "Slide",
     "pathology.label.addslide" : "Add Slide(s)",
     "pathology.label.printlabel" : "Print Label",
-    "pathology.label.view" : "View",
+    "pathology.label.view" : "View Report",
     "pathology.label.dashboard" : "Pathology DashBoard",
     "pathology.label.techniques" : "Techniques Used",
     "pathology.label.request" : "Requests",
diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
index 4865dc877b..74ceb1b703 100644
--- a/frontend/src/languages/fr.json
+++ b/frontend/src/languages/fr.json
@@ -112,7 +112,7 @@
     "pathology.label.slide" : "Lame",
     "pathology.label.addslide" : "Ajouter une Lame(s)",
     "pathology.label.printlabel" : "Imprimer l'Étiquette",
-    "pathology.label.view" : "Voir",
+    "pathology.label.view" : "Voir le rapport",
     "pathology.label.dashboard" : "Tableau de Bord de la Pathologie",
     "pathology.label.techniques" : "Techniques Utilisées",
     "pathology.label.request" : "Demandes",