diff --git a/core/lib/Drupal/Core/Entity/ContentEntityForm.php b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
index 02eee80f1cd59729ba2ae19acefa6673382e0227..981fb90d5668c3065b528170df74985c7be3c397 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityForm.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
@@ -127,6 +127,15 @@ public function form(array $form, FormStateInterface $form_state) {
       $this->addRevisionableFormFields($form);
     }
 
+    $form['footer'] = [
+      '#type' => 'container',
+      '#weight' => 99,
+      '#attributes' => [
+        'class' => ['entity-content-form-footer']
+      ],
+      '#optional' => TRUE,
+    ];
+
     return $form;
   }
 
diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index 4c9bbac7b6595506037068b9548201969dece0a2..552e3fb6bad71d5b0307413726e11eb1e2f057ba 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -142,13 +142,6 @@ public function form(array $form, FormStateInterface $form_state) {
       '#wrapper_attributes' => ['class' => ['entity-meta__author']],
     ];
 
-    $form['footer'] = [
-      '#type' => 'container',
-      '#weight' => 99,
-      '#attributes' => [
-        'class' => ['node-form-footer']
-      ]
-    ];
     $form['status']['#group'] = 'footer';
 
     // Node author information for administrators.
diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index 672e59118e04c9f8a5d8a10a3ace67385bd6baee..8ec05a3d7fccce34cfab9212b4eef80cc412698c 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 .entity-content-form-footer,
 .node-form .field--name-status {
   margin-bottom: 0;
 }