diff --git a/src/components/Button/index.jsx b/src/components/Button/index.jsx
index 37bc29a20..fb87306be 100644
--- a/src/components/Button/index.jsx
+++ b/src/components/Button/index.jsx
@@ -9,7 +9,7 @@ import { expandDts } from '../../lib/utils';
 import './styles.scss';
 
 const Button = props => {
-  const { bsSize, bsStyle, children, className, disabled, dts, href, inverse, isLoading, size, target } = props;
+  const { bsSize, bsStyle, children, className, disabled, dts, href, inverse, isLoading, size, target, type } = props;
   const baseClass = 'aui--button';
   const classes = classNames(
     baseClass,
@@ -49,6 +49,7 @@ const Button = props => {
       data-testid="button-wrapper"
       disabled={isLoading || disabled}
       className={classes}
+      type={type}
       {...expandDts(dts)}
       {..._.omit(props, _.keys(adslotButtonPropTypes))}
     >
@@ -83,6 +84,10 @@ const adslotButtonPropTypes = {
    * PropTypes.oneOf(['small', 'large'])
    */
   size: PropTypes.oneOf(['small', 'large']),
+  /**
+   * PropTypes.oneOf(['button', 'reset', 'submit'])
+   */
+  type: PropTypes.oneOf(['button', 'reset', 'submit']),
 };
 
 Button.propTypes = { ...adslotButtonPropTypes };
@@ -93,6 +98,7 @@ Button.defaultProps = {
   size: 'small',
   bsStyle: 'default',
   target: '_self',
+  type: 'button',
 };
 
 export default Button;
diff --git a/src/components/ConfirmModal/__snapshots__/index.spec.jsx.snap b/src/components/ConfirmModal/__snapshots__/index.spec.jsx.snap
index 0d0304a48..e39ab1dcc 100644
--- a/src/components/ConfirmModal/__snapshots__/index.spec.jsx.snap
+++ b/src/components/ConfirmModal/__snapshots__/index.spec.jsx.snap
@@ -31,6 +31,7 @@ exports[`<ConfirmModal /> should show modal when \`show\` is true 1`] = `
           class="aui--button btn-primary"
           data-test-selector="confirm-modal-confirm"
           data-testid="confirm-modal-confirm"
+          type="button"
         >
           <div
             class="aui--button-children-container"
diff --git a/www/containers/props.json b/www/containers/props.json
index 145772698..572704157 100644
--- a/www/containers/props.json
+++ b/www/containers/props.json
@@ -754,6 +754,31 @@
             "value": "'small'",
             "computed": false
           }
+        },
+        "type": {
+          "type": {
+            "name": "enum",
+            "value": [
+              {
+                "value": "'button'",
+                "computed": false
+              },
+              {
+                "value": "'reset'",
+                "computed": false
+              },
+              {
+                "value": "'submit'",
+                "computed": false
+              }
+            ]
+          },
+          "required": false,
+          "description": "PropTypes.oneOf(['button', 'reset', 'submit'])",
+          "defaultValue": {
+            "value": "'button'",
+            "computed": false
+          }
         }
       }
     }
diff --git a/www/examples/FilePicker.mdx b/www/examples/FilePicker.mdx
index 117eca991..9b839ac49 100644
--- a/www/examples/FilePicker.mdx
+++ b/www/examples/FilePicker.mdx
@@ -13,7 +13,9 @@ class FilePickerExample extends React.PureComponent {
 
 render(
   <div style={{ width: 400 }}>
-    <FilePickerExample />
+    <form>
+      <FilePickerExample />
+    </form>
   </div>
 );
 ```