diff --git a/core/lib/Drupal/Core/Entity/EntityFormController.php b/core/lib/Drupal/Core/Entity/EntityFormController.php
index f4fc459..a5c7a0a 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormController.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormController.php
@@ -51,7 +51,8 @@ public function build(array $form, array &$form_state, EntityInterface $entity)
     // Retrieve and add the form actions array.
     $actions = $this->actionsElement($form, $form_state);
     if (!empty($actions)) {
-      $form['actions'] = $actions;
+      $form += array('actions' => array());
+      $form['actions'] += $actions;
     }
 
     return $form;
diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/lib/Drupal/node/NodeFormController.php
index 215ad81..aa61280 100644
--- a/core/modules/node/lib/Drupal/node/NodeFormController.php
+++ b/core/modules/node/lib/Drupal/node/NodeFormController.php
@@ -216,10 +216,18 @@ public function form(array $form, array &$form_state, EntityInterface $node) {
       '#weight' => 95,
     );
 
-    $form['options']['status'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Published'),
+    $form['actions']['meta'] = array(
+      '#type' => 'container',
+      '#attributes' => array('class' => array('form-meta-wrapper', 'container-inline')),
+    );
+    $form['actions']['meta']['status'] = array(
+      '#type' => 'select',
+      '#title' => t('Status'),
       '#default_value' => $node->status,
+      '#options' => array(
+        0 => t('Draft'),
+        1 => t('Published'),
+      ),
     );
 
     $form['options']['promote'] = array(
diff --git a/core/modules/system/system.theme.css b/core/modules/system/system.theme.css
index 6a4a64d..0b74cc7 100644
--- a/core/modules/system/system.theme.css
+++ b/core/modules/system/system.theme.css
@@ -126,6 +126,9 @@ abbr.form-required, abbr.tabledrag-changed, abbr.ajax-changed {
 .form-item select.error {
   border: 2px solid red;
 }
+.form-meta-wrapper {
+  margin: 1em 0;
+}
 
 /**
  * Inline items.