diff --git a/client/src/EMS/RingdownForm.js b/client/src/EMS/RingdownForm.js
index a7975807..1e8b6146 100644
--- a/client/src/EMS/RingdownForm.js
+++ b/client/src/EMS/RingdownForm.js
@@ -139,11 +139,10 @@ function RingdownForm({ defaultPayload, className }) {
               </p>
             </div>
           </div>
-          {step === 0 && <PatientFields onChange={onChange} ringdown={ringdown} />}
-          {step === 1 && <HospitalSelection onChange={onChange} ringdown={ringdown} />}
           <fieldset className="usa-fieldset border-top border-base-lighter">
             {step === 0 && (
               <>
+                <PatientFields onChange={onChange} ringdown={ringdown} />
                 <button disabled={!ringdown.isPatientValid} className="usa-button width-full" type="button" onClick={next}>
                   Select Hospital
                 </button>
@@ -154,6 +153,7 @@ function RingdownForm({ defaultPayload, className }) {
             )}
             {step === 1 && (
               <>
+                <HospitalSelection onChange={onChange} ringdown={ringdown} />
                 <button disabled={!ringdown.isValid} className="usa-button width-full" type="button" onClick={send}>
                   Send Ringdown
                 </button>