diff --git a/packages/component-submit/src/components/Submit.js b/packages/component-submit/src/components/Submit.js
index 585c0d5f5a9493213f816e2547fcc1b802b2e192..2fdfdad9275923b5dc9d50903bdbe35effe3e125 100644
--- a/packages/component-submit/src/components/Submit.js
+++ b/packages/component-submit/src/components/Submit.js
@@ -36,8 +36,7 @@ const Submit = ({ project, version, valid, error, handleSubmit, uploadFile, conf
         <Button
           type="button"
           primary
-          onClick={toggleConfirming}
-          disabled={!valid}>
+          onClick={toggleConfirming}>
           Submit your manuscript
         </Button>
       </div>
diff --git a/packages/component-submit/src/components/SubmitPage.js b/packages/component-submit/src/components/SubmitPage.js
index f4994d268dafd5ccb743bb69affb3019b1de9e00..aebffc7be1769cbd8cfd8b6635630ae072ea1093 100644
--- a/packages/component-submit/src/components/SubmitPage.js
+++ b/packages/component-submit/src/components/SubmitPage.js
@@ -76,8 +76,13 @@ export default compose(
   }),
   withState('confirming', 'setConfirming', false),
   withHandlers({
-    toggleConfirming: props => () => {
-      props.setConfirming(confirming => !confirming)
+    toggleConfirming: ({valid, setConfirming, handleSubmit}) => () => {
+      if (valid) {
+        setConfirming(confirming => !confirming)
+      } else {
+        // trigger dummy submit to mark all fields as touched
+        handleSubmit(() => {})()
+      }
     }
   })
 )(Submit)