diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
index 545c35109f..9a16fbfb12 100644
--- a/system/docs/CHANGELOG.md
+++ b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS changelog
 Version 3.3.6 (2014-XX-XX)
 --------------------------
 
+### Fixed
+Re-add the surrounding "submit_container" in table forms (see #7396).
+
 ### Fixed
 Do not generally remove insert tags from page titles (see #7198).
 
diff --git a/system/modules/core/templates/forms/form_submit.html5 b/system/modules/core/templates/forms/form_submit.html5
index e50564ada7..59af8754c1 100644
--- a/system/modules/core/templates/forms/form_submit.html5
+++ b/system/modules/core/templates/forms/form_submit.html5
@@ -1,9 +1,15 @@
 <?php $this->extend('form_row'); ?>
 
 <?php $this->block('field'); ?>
+  <?php if (!$this->tableless): ?>
+    <div class="submit_container">
+  <?php endif; ?>
   <?php if ($this->src): ?>
     <input type="image" src="<?php echo $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>
   <?php else: ?>
     <input type="submit" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>
   <?php endif; ?>
+  <?php if (!$this->tableless): ?>
+    </div>
+  <?php endif; ?>
 <?php $this->endblock(); ?>
diff --git a/system/modules/core/templates/forms/form_submit.xhtml b/system/modules/core/templates/forms/form_submit.xhtml
index 1dc3a2d452..c7fde6b357 100644
--- a/system/modules/core/templates/forms/form_submit.xhtml
+++ b/system/modules/core/templates/forms/form_submit.xhtml
@@ -1,9 +1,15 @@
 <?php $this->extend('form_row'); ?>
 
 <?php $this->block('field'); ?>
+  <?php if (!$this->tableless): ?>
+    <div class="submit_container">
+  <?php endif; ?>
   <?php if ($this->src): ?>
     <input type="image" src="<?php echo $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?> />
   <?php else: ?>
     <input type="submit" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?> />
   <?php endif; ?>
+  <?php if (!$this->tableless): ?>
+    </div>
+  <?php endif; ?>
 <?php $this->endblock(); ?>