diff --git a/src/Components/Heading.js b/src/Components/Heading.js
index d05549bc..7da768e3 100644
--- a/src/Components/Heading.js
+++ b/src/Components/Heading.js
@@ -6,10 +6,8 @@ import './Heading.scss';
 function Heading({ title, subtitle, badge, children }) {
   return (
     <h3 className="usa-accordion__heading heading">
-      <div>
-        {title}
-        {subtitle && <div className="heading__subtitle">{subtitle}</div>}
-      </div>
+      {title}
+      {subtitle && <div className="heading__subtitle">{subtitle}</div>}
       {badge && <div className="heading__badge">{badge}</div>}
       {children}
     </h3>
diff --git a/src/EMS/PatientFields.js b/src/EMS/PatientFields.js
index 8bd51b73..4caa50f8 100644
--- a/src/EMS/PatientFields.js
+++ b/src/EMS/PatientFields.js
@@ -153,6 +153,9 @@ function PatientFields({ ringdown, onChange }) {
                     <FormField
                       metadata={Patient.supplementalOxygenAmount}
                       disabled={ringdown.lowOxygenResponseType !== 'SUPPLEMENTAL OXYGEN'}
+                      // we don't want to wrap this input as inputs with min/max values resize differently in Chrome, which then causes
+                      // the unit label to wrap to the next line, due to the `flex-wrap: wrap` in .grid-row
+                      isWrapped={false}
                     />
                   </div>
                 }