diff --git a/src/results/result-form-field.component.tsx b/src/results/result-form-field.component.tsx
index 5b89c2da..ffdcc651 100644
--- a/src/results/result-form-field.component.tsx
+++ b/src/results/result-form-field.component.tsx
@@ -51,17 +51,6 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({
 
   return (
     <>
-      {Object.keys(errors).length > 0 && (
-        <InlineNotification
-          className={styles.emptyFormError}
-          lowContrast
-          title={t("error", "Error")}
-          subtitle={
-            t("pleaseFillField", "Please fill at least one field") + "."
-          }
-          hideCloseButton
-        />
-      )}
       {isTextOrNumeric(concept) && (
         <Controller
           control={control}
@@ -189,6 +178,18 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({
             );
           }
         })}
+
+      {Object.keys(errors).length > 0 && (
+        <InlineNotification
+          className={styles.emptyFormError}
+          lowContrast
+          title={t("error", "Error")}
+          subtitle={
+            t("pleaseFillField", "Please fill at least one field") + "."
+          }
+          hideCloseButton
+        />
+      )}
     </>
   );
 };
diff --git a/src/results/result-form.scss b/src/results/result-form.scss
index 3adf0f33..d9c437d5 100644
--- a/src/results/result-form.scss
+++ b/src/results/result-form.scss
@@ -33,11 +33,14 @@
   margin-top: auto;
 }
 
+.emptyFormError {
+  margin-top: 10px;
+}
+
 .form {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  height: calc(100vh - 6rem);
 }
 
 :global(.omrs-breakpoint-lt-desktop) .form {