diff --git a/blocks/dist/custom-status.build.js b/blocks/dist/custom-status.build.js
index 2f94cf7ec..570aabed5 100644
--- a/blocks/dist/custom-status.build.js
+++ b/blocks/dist/custom-status.build.js
@@ -1,2 +1,241 @@
-!function(t){var e={};function n(o){if(e[o])return e[o].exports;var r=e[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=t,n.c=e,n.d=function(t,e,o){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:o})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(o,r,function(e){return t[e]}.bind(null,r));return o},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=1)}([,function(t,e,n){"use strict";n.r(e);n(5),n(6);var o=wp.i18n.__,r=wp.editPost.PluginPostStatusInfo,u=wp.plugins.registerPlugin,s=wp.data,i=s.subscribe,l=s.dispatch,a=s.select,c=s.withSelect,d=s.withDispatch,f=wp.compose.compose,p=wp.components.SelectControl,m=window.EditFlowCustomStatuses.map(function(t){return{label:t.name,value:t.slug}}),b=function(t){return m.find(function(e){return e.value===t}).label},w=function(t){document.querySelector(".editor-post-save-draft")&&(document.querySelector(".editor-post-save-draft").innerText="".concat(o("Save")))};i(function(){if(a("core/editor").getCurrentPostId())if(a("core/editor").isCleanNewPost())l("core/editor").editPost({status:ef_default_custom_status});else{var t=a("core/editor").getEditedPostAttribute("status");void 0!==t&&"publish"!==t&&w(b(t))}});u("edit-flow-custom-status",{icon:"edit-flow",render:f(c(function(t){return{status:t("core/editor").getEditedPostAttribute("status")}}),d(function(t){return{onUpdate:function(e){t("core/editor").editPost({status:e}),w(b(e))}}}))(function(t){var e=t.onUpdate,n=t.status;return wp.element.createElement(r,{className:"edit-flow-extended-post-status edit-flow-extended-post-status-".concat(n)},wp.element.createElement("h4",null,o("publish"!==n?"Extended Post Status":"Extended Post Status Disabled.","edit-flow")),"publish"!==n?wp.element.createElement(p,{label:"",value:n,options:m,onChange:e}):null,wp.element.createElement("small",{className:"edit-flow-extended-post-status-note"},o("publish"!==n?"Note: this will override all status settings above.":"To select a custom status, please unpublish the content first.","edit-flow")))})})},,,,function(t,e){},function(t,e){}]);
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = "./blocks/src/custom-status/block.js");
+/******/ })
+/************************************************************************/
+/******/ ({
+
+/***/ "./blocks/src/custom-status/block.js":
+/*!*******************************************!*\
+  !*** ./blocks/src/custom-status/block.js ***!
+  \*******************************************/
+/*! no exports provided */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _editor_scss__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./editor.scss */ "./blocks/src/custom-status/editor.scss");
+/* harmony import */ var _editor_scss__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_editor_scss__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _style_scss__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./style.scss */ "./blocks/src/custom-status/style.scss");
+/* harmony import */ var _style_scss__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_style_scss__WEBPACK_IMPORTED_MODULE_1__);
+
+
+var __ = wp.i18n.__;
+var PluginPostStatusInfo = wp.editPost.PluginPostStatusInfo;
+var registerPlugin = wp.plugins.registerPlugin;
+var _wp$data = wp.data,
+    subscribe = _wp$data.subscribe,
+    dispatch = _wp$data.dispatch,
+    select = _wp$data.select,
+    withSelect = _wp$data.withSelect,
+    withDispatch = _wp$data.withDispatch;
+var compose = wp.compose.compose;
+var SelectControl = wp.components.SelectControl;
+/**
+ * Map Custom Statuses as options for SelectControl
+ */
+
+var statuses = window.EditFlowCustomStatuses.map(function (s) {
+  return {
+    label: s.name,
+    value: s.slug
+  };
+});
+/**
+ * Hack :(
+ *
+ * @see https://github.com/WordPress/gutenberg/issues/3144
+ *
+ * Gutenberg overrides the label of the Save button after save (i.e. "Save Draft"). But there's no way to subscribe to a "post save" message.
+ *
+ * So instead, we're keeping the button label generic ("Save"). There's a brief period where it still flips to "Save Draft" but that's something we need to work upstream to find a good fix for.
+ */
+
+var sideEffectL10nManipulation = function sideEffectL10nManipulation() {
+  var node = document.querySelector('.editor-post-save-draft');
+
+  if (node) {
+    document.querySelector('.editor-post-save-draft').innerText = "".concat(__('Save'));
+  }
+}; // Set the status to the default custom status.
+
+
+subscribe(function () {
+  var postId = select('core/editor').getCurrentPostId(); // Post isn't ready yet so don't do anything.
+
+  if (!postId) {
+    return;
+  } // For new posts, we need to force the our default custom status.
+  // Otherwise WordPress will force it to "Draft".
+
+
+  var isCleanNewPost = select('core/editor').isCleanNewPost();
+
+  if (isCleanNewPost) {
+    dispatch('core/editor').editPost({
+      status: ef_default_custom_status
+    });
+    return;
+  } // Update the "Save" button.
+
+
+  var status = select('core/editor').getEditedPostAttribute('status');
+
+  if (typeof status !== 'undefined' && status !== 'publish') {
+    sideEffectL10nManipulation();
+  }
+});
+/**
+ * Custom status component
+ * @param object props
+ */
+
+var EditFlowCustomPostStati = function EditFlowCustomPostStati(_ref) {
+  var onUpdate = _ref.onUpdate,
+      status = _ref.status;
+  return wp.element.createElement(PluginPostStatusInfo, {
+    className: "edit-flow-extended-post-status edit-flow-extended-post-status-".concat(status)
+  }, wp.element.createElement("h4", null, status !== 'publish' ? __('Extended Post Status', 'edit-flow') : __('Extended Post Status Disabled.', 'edit-flow')), status !== 'publish' ? wp.element.createElement(SelectControl, {
+    label: "",
+    value: status,
+    options: statuses,
+    onChange: onUpdate
+  }) : null, wp.element.createElement("small", {
+    className: "edit-flow-extended-post-status-note"
+  }, status !== 'publish' ? __("Note: this will override all status settings above.", 'edit-flow') : __('To select a custom status, please unpublish the content first.', 'edit-flow')));
+};
+
+var mapSelectToProps = function mapSelectToProps(select) {
+  return {
+    status: select('core/editor').getEditedPostAttribute('status')
+  };
+};
+
+var mapDispatchToProps = function mapDispatchToProps(dispatch) {
+  return {
+    onUpdate: function onUpdate(status) {
+      dispatch('core/editor').editPost({
+        status: status
+      });
+      sideEffectL10nManipulation();
+    }
+  };
+};
+
+var plugin = compose(withSelect(mapSelectToProps), withDispatch(mapDispatchToProps))(EditFlowCustomPostStati);
+/**
+ * Kick it off
+ */
+
+registerPlugin('edit-flow-custom-status', {
+  icon: 'edit-flow',
+  render: plugin
+});
+
+/***/ }),
+
+/***/ "./blocks/src/custom-status/editor.scss":
+/*!**********************************************!*\
+  !*** ./blocks/src/custom-status/editor.scss ***!
+  \**********************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+// removed by extract-text-webpack-plugin
+
+/***/ }),
+
+/***/ "./blocks/src/custom-status/style.scss":
+/*!*********************************************!*\
+  !*** ./blocks/src/custom-status/style.scss ***!
+  \*********************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+// removed by extract-text-webpack-plugin
+
+/***/ })
+
+/******/ });
 //# sourceMappingURL=custom-status.build.js.map
\ No newline at end of file
diff --git a/blocks/src/custom-status/block.js b/blocks/src/custom-status/block.js
index 62c399adb..d74033549 100644
--- a/blocks/src/custom-status/block.js
+++ b/blocks/src/custom-status/block.js
@@ -13,11 +13,16 @@ let { SelectControl } = wp.components;
  */
 let statuses = window.EditFlowCustomStatuses.map( s => ({ label: s.name, value: s.slug }) );
 
-let getStatusLabel = slug => statuses.find( s => s.value === slug ).label;
-
-// Hack :(
-// @see https://github.com/WordPress/gutenberg/issues/3144
-let sideEffectL10nManipulation = status => {
+/**
+ * Hack :(
+ *
+ * @see https://github.com/WordPress/gutenberg/issues/3144
+ *
+ * Gutenberg overrides the label of the Save button after save (i.e. "Save Draft"). But there's no way to subscribe to a "post save" message.
+ *
+ * So instead, we're keeping the button label generic ("Save"). There's a brief period where it still flips to "Save Draft" but that's something we need to work upstream to find a good fix for.
+ */
+let sideEffectL10nManipulation = () => {
   let node = document.querySelector('.editor-post-save-draft');
   if ( node ) {
     document.querySelector( '.editor-post-save-draft' ).innerText = `${ __( 'Save' ) }`
@@ -46,7 +51,7 @@ subscribe( function () {
   // Update the "Save" button.
   var status = select( 'core/editor' ).getEditedPostAttribute( 'status' );
   if ( typeof status !== 'undefined' && status !== 'publish' ) {
-    sideEffectL10nManipulation( getStatusLabel( status ) );
+    sideEffectL10nManipulation();
   }
 } );
 
@@ -83,7 +88,7 @@ const mapDispatchToProps = ( dispatch ) => {
   return {
     onUpdate( status ) {
       dispatch( 'core/editor' ).editPost( { status } );
-      sideEffectL10nManipulation( getStatusLabel( status ) );
+      sideEffectL10nManipulation();
     },
   };
 };