diff --git a/src/client/components/controls/Button/index.js b/src/client/components/controls/Button/index.js
index 8423b0091d..25b027c1dd 100644
--- a/src/client/components/controls/Button/index.js
+++ b/src/client/components/controls/Button/index.js
@@ -19,8 +19,8 @@ const Button = (props) => {
   ].filter(Boolean).join(' ');
 
   function handleClick(event) {
-    event.preventDefault();
-    onClick();
+    if (type !== 'submit' && onClick) event.preventDefault();
+    if (onClick) onClick();
   }
 
   const buttonProps = {
@@ -53,8 +53,8 @@ const Button = (props) => {
     default:
       return (
         <button
-          {...buttonProps}
           type="button"
+          {...buttonProps}
         >
           {children}
         </button>
diff --git a/src/client/components/forms/Submit/index.js b/src/client/components/forms/Submit/index.js
index b91758acbb..84eee982f8 100644
--- a/src/client/components/forms/Submit/index.js
+++ b/src/client/components/forms/Submit/index.js
@@ -11,7 +11,10 @@ const FormSubmit = ({ children }) => {
   const formContext = useContext(FormContext);
   return (
     <div className={baseClass}>
-      <Button disabled={formContext.processing ? 'disabled' : ''}>
+      <Button
+        disabled={formContext.processing ? 'disabled' : ''}
+        type="submit"
+      >
         {children}
       </Button>
     </div>