diff --git a/core/lib/Drupal/Core/Entity/ContentEntityForm.php b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
index 362d130..71a8e39 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityForm.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
@@ -127,16 +127,13 @@ public function form(array $form, FormStateInterface $form_state) {
       $this->addRevisionableFormFields($form);
     }
 
-    if ($this->entity instanceof EntityPublishedInterface) {
-      $form['footer'] = [
-        '#type' => 'container',
-        '#weight' => 99,
-        '#attributes' => [
-          'class' => ['contententity-form-footer']
-        ]
-      ];
-      $form['status']['#group'] = 'footer';
-    }
+    $form['footer'] = [
+      '#type' => 'container',
+      '#weight' => 99,
+      '#attributes' => [
+        'class' => ['entity-content-form-footer']
+      ]
+    ];
 
     return $form;
   }
diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index 3417096..a9f0e93 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -102,6 +102,8 @@ public function form(array $form, FormStateInterface $form_state) {
 
     $form['advanced']['#attributes']['class'][] = 'entity-meta';
 
+    $form['status']['#group'] = 'footer';
+
     // Node author information for administrators.
     $form['author'] = [
       '#type' => 'details',
diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index ef1f246..8ec05a3 100644
--- a/core/themes/bartik/css/components/form.css
+++ b/core/themes/bartik/css/components/form.css
@@ -172,7 +172,7 @@ input.form-submit:focus {
 .node-form .form-wrapper {
   margin-bottom: 2em;
 }
-.node-form .contententity-form-footer,
+.node-form .entity-content-form-footer,
 .node-form .field--name-status {
   margin-bottom: 0;
 }