diff --git a/core/lib/Drupal/Core/Entity/ContentEntityForm.php b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
index 14e910d..362d130 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityForm.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
@@ -127,6 +127,17 @@ 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';
+    }
+
     return $form;
   }
 
diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index 007b7c6..3417096 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -102,15 +102,6 @@ public function form(array $form, FormStateInterface $form_state) {
 
     $form['advanced']['#attributes']['class'][] = 'entity-meta';
 
-    $form['footer'] = [
-      '#type' => 'container',
-      '#weight' => 99,
-      '#attributes' => [
-        'class' => ['node-form-footer']
-      ]
-    ];
-    $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 672e591..ef1f246 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 .node-form-footer,
+.node-form .contententity-form-footer,
 .node-form .field--name-status {
   margin-bottom: 0;
 }