diff --git a/app/components/component-submit/src/components/FormTemplate.js b/app/components/component-submit/src/components/FormTemplate.js
index 974b97a0b28864beabb2c031c04f1590f7fd1a40..b3138cb684ebf1a073d5fe46aa212920064d809a 100644
--- a/app/components/component-submit/src/components/FormTemplate.js
+++ b/app/components/component-submit/src/components/FormTemplate.js
@@ -187,31 +187,34 @@ const FormTemplate = ({
 }) => {
   const client = useApolloClient()
 
-  const submitButton = (text, haspopup = false) => (
-    <div>
-      <Button
-        onClick={async () => {
-          const hasErrors = Object.keys(await validateForm()).length !== 0
-
-          // If there are errors, do a fake submit
-          // to focus on the error
-          if (
-            hasErrors ||
-            values.status === articleStatuses.evaluated ||
-            (values.status === articleStatuses.submitted && !haspopup)
-          ) {
-            handleSubmit()
-          } else {
-            toggleConfirming()
-          }
-        }}
-        primary
-        type="button"
-      >
-        {text}
-      </Button>
-    </div>
-  )
+  const submitButton = (text, haspopup = false) => {
+    return (
+      <div>
+        <Button
+          onClick={async () => {
+            const hasErrors = Object.keys(await validateForm()).length !== 0
+
+            // If there are errors, do a fake submit
+            // to focus on the error
+            if (
+              hasErrors ||
+              values.status === articleStatuses.evaluated ||
+              values.status === articleStatuses.submitted ||
+              !haspopup
+            ) {
+              handleSubmit()
+            } else {
+              toggleConfirming()
+            }
+          }}
+          primary
+          type="button"
+        >
+          {text}
+        </Button>
+      </div>
+    )
+  }
 
   const submitButtonText = match.url.includes('/evaluation')
     ? 'Submit Evaluation'