diff --git a/src/components/Facility/PatientNoteCard.tsx b/src/components/Facility/PatientNoteCard.tsx
index 4d5a9ffa89c..49c8cf4204b 100644
--- a/src/components/Facility/PatientNoteCard.tsx
+++ b/src/components/Facility/PatientNoteCard.tsx
@@ -213,7 +213,9 @@ const PatientNoteCard = ({
                 </div>
               </div>
             ) : (
-              <div className="text-sm text-secondary-700">{noteField}</div>
+              <div className="text-sm text-secondary-700 whitespace-pre-wrap">
+                {noteField}
+              </div>
             )}
           </div>
         }
diff --git a/src/components/Form/Form.tsx b/src/components/Form/Form.tsx
index 18f190ccc3c..5a3bf552b26 100644
--- a/src/components/Form/Form.tsx
+++ b/src/components/Form/Form.tsx
@@ -98,11 +98,6 @@ const Form = <T extends FormDetails>({
   return (
     <form
       onSubmit={handleSubmit}
-      onKeyDown={(e) => {
-        if (e.key === "Enter") {
-          handleSubmit(e);
-        }
-      }}
       className={classNames(
         "mx-auto w-full",
         !props.noPadding && "px-8 py-5 md:px-16 md:py-11",