diff --git a/admin/javascript/src/components/form-action/index.js b/admin/javascript/src/components/form-action/index.js
index 4aa4567c1..be3439a00 100644
--- a/admin/javascript/src/components/form-action/index.js
+++ b/admin/javascript/src/components/form-action/index.js
@@ -13,6 +13,7 @@ class FormActionComponent extends SilverStripeComponent {
       type: this.props.type,
       className: this.getButtonClasses(),
       disabled: this.props.disabled,
+      onClick: this.handleClick,
     };
 
     if (typeof this.props.id !== 'undefined') {
@@ -100,7 +101,7 @@ class FormActionComponent extends SilverStripeComponent {
 
 FormActionComponent.propTypes = {
   id: React.PropTypes.string,
-  handleClick: React.PropTypes.func.isRequired,
+  handleClick: React.PropTypes.func,
   label: React.PropTypes.string,
   type: React.PropTypes.string,
   loading: React.PropTypes.bool,
diff --git a/gulpfile.js b/gulpfile.js
index 6d1a0a76e..23628f564 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -358,6 +358,7 @@ gulp.task('bundle-framework', function bundleBoot() {
     .external('components/action-button/index')
     .external('components/north-header/index')
     .external('components/form-builder/index')
+    .external('components/form-action/index')
     .external('deep-freeze')
     .external('components/grid-field/index')
     .external('i18n')