diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index a1da3af86..1751ca9fe 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -110,7 +110,7 @@ Extremely helpful in meeting the threshold.
 ## 🎨 Styleguide Requirements
 
 Our styleguide (powered by [Storybook](https://storybook.js.org/)) requires a bit of manual
-documentation of components to be properly infer prop types.
+documenting of components to properly infer prop types.
 
 - Component definitions require a
   [docblock comment description](https://github.com/reactjs/react-docgen#proptypes). Furthermore, a
diff --git a/packages/core/src/components/FormActions.story.tsx b/packages/core/src/components/FormActions.story.tsx
index c91521deb..091e663b3 100644
--- a/packages/core/src/components/FormActions.story.tsx
+++ b/packages/core/src/components/FormActions.story.tsx
@@ -20,4 +20,5 @@ storiesOf('Core/FormActions', module)
   .add('With a reset button.', () => <FormActions showReset />)
   .add('With small buttons in a processing state.', () => (
     <FormActions showReset small processing />
-  ));
+  ))
+  .add('In a danger state.', () => <FormActions danger />);
diff --git a/packages/forms/src/components/Autocomplete.story.tsx b/packages/forms/src/components/Autocomplete.story.tsx
index 2f5747bcf..fce2b549b 100644
--- a/packages/forms/src/components/Autocomplete.story.tsx
+++ b/packages/forms/src/components/Autocomplete.story.tsx
@@ -16,7 +16,13 @@ storiesOf('Forms/Autocomplete', module)
     inspectComponents: [Autocomplete],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <Autocomplete
         name="field"
         label="Label"
diff --git a/packages/forms/src/components/CheckBox.story.tsx b/packages/forms/src/components/CheckBox.story.tsx
index 5da90a4d2..d15b9ece9 100644
--- a/packages/forms/src/components/CheckBox.story.tsx
+++ b/packages/forms/src/components/CheckBox.story.tsx
@@ -9,7 +9,13 @@ storiesOf('Forms/CheckBox', module)
     inspectComponents: [CheckBox],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <CheckBox name="field" label="Label" validator={() => {}} />
     </Form>
   ));
diff --git a/packages/forms/src/components/CheckBoxController.story.tsx b/packages/forms/src/components/CheckBoxController.story.tsx
index 5baeac5e6..015f1f8fe 100644
--- a/packages/forms/src/components/CheckBoxController.story.tsx
+++ b/packages/forms/src/components/CheckBoxController.story.tsx
@@ -9,7 +9,13 @@ storiesOf('Forms/CheckBoxController', module)
     inspectComponents: [CheckBoxController],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <CheckBoxController name="field" label="Label" validator={() => {}}>
         {CheckBox => (
           <div>
diff --git a/packages/forms/src/components/DatePickerInput.story.tsx b/packages/forms/src/components/DatePickerInput.story.tsx
index c5bd87d45..1b8c19e07 100644
--- a/packages/forms/src/components/DatePickerInput.story.tsx
+++ b/packages/forms/src/components/DatePickerInput.story.tsx
@@ -9,7 +9,13 @@ storiesOf('Forms/DatePickerInput', module)
     inspectComponents: [DatePickerInput],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <DatePickerInput name="field" label="Label" validator={() => {}} />
     </Form>
   ));
diff --git a/packages/forms/src/components/DateTimeSelect.story.tsx b/packages/forms/src/components/DateTimeSelect.story.tsx
index fd86ffb04..f5040eea6 100644
--- a/packages/forms/src/components/DateTimeSelect.story.tsx
+++ b/packages/forms/src/components/DateTimeSelect.story.tsx
@@ -9,7 +9,13 @@ storiesOf('Forms/DateTimeSelect', module)
     inspectComponents: [DateTimeSelect],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <DateTimeSelect name="field" label="Label" validator={() => {}} />
     </Form>
   ));
diff --git a/packages/forms/src/components/FeedbackForm.story.tsx b/packages/forms/src/components/FeedbackForm.story.tsx
index 14beef3d9..4e50072a6 100644
--- a/packages/forms/src/components/FeedbackForm.story.tsx
+++ b/packages/forms/src/components/FeedbackForm.story.tsx
@@ -16,7 +16,11 @@ storiesOf('Forms/FeedbackForm', module)
       channel="Lunar"
       channelID={1}
       teamID={2}
-      onSubmit={action('onSubmit')}
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
     />
   ))
   .add('Without bug reporting.', () => (
@@ -28,7 +32,11 @@ storiesOf('Forms/FeedbackForm', module)
       channel="Lunar"
       channelID={1}
       teamID={2}
-      onSubmit={action('onSubmit')}
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
       disableBugReporting
     />
   ));
diff --git a/packages/forms/src/components/FileInput.story.tsx b/packages/forms/src/components/FileInput.story.tsx
index 74fc95d7a..a3b2ce9e5 100644
--- a/packages/forms/src/components/FileInput.story.tsx
+++ b/packages/forms/src/components/FileInput.story.tsx
@@ -9,7 +9,13 @@ storiesOf('Forms/FileInput', module)
     inspectComponents: [FileInput],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <FileInput name="field" label="Label" validator={() => {}} />
     </Form>
   ));
diff --git a/packages/forms/src/components/FilterMenu.story.tsx b/packages/forms/src/components/FilterMenu.story.tsx
index 7c4de3c16..7e8223c33 100644
--- a/packages/forms/src/components/FilterMenu.story.tsx
+++ b/packages/forms/src/components/FilterMenu.story.tsx
@@ -12,7 +12,13 @@ storiesOf('Forms/FilterMenu', module)
   })
   .addDecorator(story => <div style={{ margin: 'auto' }}>{story()}</div>)
   .add('Form in a dropdown.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
         <FilterMenu
           accessibilityLabel="Filter menu"
@@ -47,7 +53,13 @@ storiesOf('Forms/FilterMenu', module)
     </Form>
   ))
   .add('Left-aligned menu.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <FilterMenu dropdownProps={{ left: 0 }} accessibilityLabel="Filter menu">
         <Row>
           <Select
@@ -75,7 +87,13 @@ storiesOf('Forms/FilterMenu', module)
     </Form>
   ))
   .add('With overflow.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
         <FilterMenu accessibilityLabel="Filter menu" menuProps={{ maxHeight: 200 }} zIndex={2}>
           <Row>
diff --git a/packages/forms/src/components/Form.story.tsx b/packages/forms/src/components/Form.story.tsx
index 8b9668590..6cf58ecaa 100644
--- a/packages/forms/src/components/Form.story.tsx
+++ b/packages/forms/src/components/Form.story.tsx
@@ -73,7 +73,11 @@ class UnmountExample extends React.Component<{}, { mounted: boolean }> {
     return (
       <Form
         onFailedSubmit={action('onFailedSubmit')}
-        onSubmit={action('onSubmit')}
+        onSubmit={() => {
+          action('onSubmit')();
+
+          return Promise.resolve();
+        }}
         onStateUpdate={action('onStateUpdate')}
       >
         {mounted && (
@@ -113,7 +117,11 @@ storiesOf('Forms/Form', module)
     <Form
       initialValues={values}
       onFailedSubmit={action('onFailedSubmit')}
-      onSubmit={action('onSubmit')}
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
       onStateUpdate={action('onStateUpdate')}
     >
       <Input
diff --git a/packages/forms/src/components/FormActions.story.tsx b/packages/forms/src/components/FormActions.story.tsx
index e0e89b623..9c1d2b152 100644
--- a/packages/forms/src/components/FormActions.story.tsx
+++ b/packages/forms/src/components/FormActions.story.tsx
@@ -9,7 +9,13 @@ storiesOf('Forms/FormActions', module)
     inspectComponents: [FormActions],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <FormActions />
     </Form>
   ));
diff --git a/packages/forms/src/components/Input.story.tsx b/packages/forms/src/components/Input.story.tsx
index f539908d0..b1027efb8 100644
--- a/packages/forms/src/components/Input.story.tsx
+++ b/packages/forms/src/components/Input.story.tsx
@@ -9,7 +9,13 @@ storiesOf('Forms/Input', module)
     inspectComponents: [Input],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <Input name="field" label="Label" validator={() => {}} />
     </Form>
   ));
diff --git a/packages/forms/src/components/Multicomplete.story.tsx b/packages/forms/src/components/Multicomplete.story.tsx
index 2c62d5db8..bc91c15eb 100644
--- a/packages/forms/src/components/Multicomplete.story.tsx
+++ b/packages/forms/src/components/Multicomplete.story.tsx
@@ -16,7 +16,13 @@ storiesOf('Forms/Multicomplete', module)
     inspectComponents: [Multicomplete],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <Multicomplete
         name="field"
         label="Label"
diff --git a/packages/forms/src/components/RadioButtonController.story.tsx b/packages/forms/src/components/RadioButtonController.story.tsx
index f2951859d..633c51c00 100644
--- a/packages/forms/src/components/RadioButtonController.story.tsx
+++ b/packages/forms/src/components/RadioButtonController.story.tsx
@@ -9,7 +9,13 @@ storiesOf('Forms/RadioButtonController', module)
     inspectComponents: [RadioButtonController],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <RadioButtonController name="field" label="Label" validator={() => {}}>
         {RadioButton => (
           <div>
diff --git a/packages/forms/src/components/Select.story.tsx b/packages/forms/src/components/Select.story.tsx
index 3b5de17cb..81a1bc928 100644
--- a/packages/forms/src/components/Select.story.tsx
+++ b/packages/forms/src/components/Select.story.tsx
@@ -9,7 +9,13 @@ storiesOf('Forms/Select', module)
     inspectComponents: [Select],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <Select name="field" label="Label" validator={() => {}}>
         <option value="foo">Foo</option>
         <option value="bar">Bar</option>
diff --git a/packages/forms/src/components/Switch.story.tsx b/packages/forms/src/components/Switch.story.tsx
index ca27f5d24..ff9910d86 100644
--- a/packages/forms/src/components/Switch.story.tsx
+++ b/packages/forms/src/components/Switch.story.tsx
@@ -9,7 +9,13 @@ storiesOf('Forms/Switch', module)
     inspectComponents: [Switch],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <Switch name="field" label="Label" validator={() => {}} />
     </Form>
   ));
diff --git a/packages/forms/src/components/TextArea.story.tsx b/packages/forms/src/components/TextArea.story.tsx
index 2edb6dfe0..29fd73cb6 100644
--- a/packages/forms/src/components/TextArea.story.tsx
+++ b/packages/forms/src/components/TextArea.story.tsx
@@ -9,7 +9,13 @@ storiesOf('Forms/TextArea', module)
     inspectComponents: [TextArea],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <TextArea name="field" label="Label" validator={() => {}} />
     </Form>
   ));
diff --git a/packages/forms/src/components/ToggleButtonController.story.tsx b/packages/forms/src/components/ToggleButtonController.story.tsx
index 4dd52d602..31957d2c6 100644
--- a/packages/forms/src/components/ToggleButtonController.story.tsx
+++ b/packages/forms/src/components/ToggleButtonController.story.tsx
@@ -10,7 +10,13 @@ storiesOf('Forms/ToggleButtonController', module)
     inspectComponents: [ToggleButtonController],
   })
   .add('Connected to the parent `Form`.', () => (
-    <Form onSubmit={action('onSubmit')}>
+    <Form
+      onSubmit={() => {
+        action('onSubmit')();
+
+        return Promise.resolve();
+      }}
+    >
       <ToggleButtonController name="field" label="Label" validator={() => {}}>
         {ControlledButton => (
           <ButtonGroup>