diff --git a/Classes/Backend/Preview/ContainerPreviewRenderer.php b/Classes/Backend/Preview/ContainerPreviewRenderer.php
index f81d7991..54774a65 100644
--- a/Classes/Backend/Preview/ContainerPreviewRenderer.php
+++ b/Classes/Backend/Preview/ContainerPreviewRenderer.php
@@ -26,8 +26,9 @@ public function __construct(GridRenderer $gridRenderer) {
 
     public function renderPageModulePreviewContent(GridColumnItem $item): string
     {
-        $content = parent::renderPageModulePreviewContent($item);
-        $grid = $this->gridRenderer->renderGrid($item->getRecord(), $item->getContext(), $item);
-        return $content . $grid;
+        $record = $item->getRecord();
+        $record['tx_container_grid'] = $this->gridRenderer->renderGrid($record, $item->getContext(), $item);
+        $item->setRecord($record);
+        return parent::renderPageModulePreviewContent($item);
     }
 }
diff --git a/Resources/Private/Templates/Container.html b/Resources/Private/Templates/Container.html
index 24ec7770..a91e8da2 100644
--- a/Resources/Private/Templates/Container.html
+++ b/Resources/Private/Templates/Container.html
@@ -2,11 +2,5 @@
     xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
     data-namespace-typo3-fluid="true"
 >
-<f:comment>
-  note: the tx_container_grid variable not set for TYPO3 v11,
-  in TYPO3 v11 the ContainerPreviewRenderer renders the container grid after content from StandardContentPreviewRenderer
-  in TYPO3 > v11 this variable is assigned in PageContentPreviewRendering EventListener
-  in this case of backendLayout is set, not ContainerPreviewRenderer is used
-</f:comment>
 <f:format.raw>{tx_container_grid}</f:format.raw>
 </html>
\ No newline at end of file