diff --git a/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html b/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html
index adf9a14..3791359 100644
--- a/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html
+++ b/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html
@@ -2,6 +2,7 @@
     <f:if condition="{column.active}">
         <f:then>
             <div class="btn-group t3-page-column-header-icons">
+                <f:if condition="{collapsable}">
                 <a href="#"
                    class="btn btn-sm btn-default btn-borderless t3js-toggle-container-column"
                    title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
@@ -16,6 +17,7 @@
                    data-collapse-state="expanded">
                     <core:icon identifier="actions-view-list-collapse" />
                 </a>
+                </f:if>
                 <f:if condition="{allowEditContent} && {column.editUrl}">
                     <a href="{column.editUrl}" title="{column.editLinkTitle}" class="btn btn-sm btn-default btn-borderless"><core:icon identifier="actions-document-open" /></a>
                 </f:if>
@@ -47,6 +49,8 @@
         <div class="t3-page-ce-dropzone t3js-page-ce-dropzone-available"></div>
     </div>
 </f:if>
+<f:if condition="{collapsable}">
 <div class="t3-page-ce container-collapsed-column-marker">
     {f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:contentcollapsed')}
 </div>
+</f:if>
diff --git a/Resources/Private/Templates/Container/Grid.html b/Resources/Private/Templates/Container/Grid.html
index e3fff3c..d664583 100644
--- a/Resources/Private/Templates/Container/Grid.html
+++ b/Resources/Private/Templates/Container/Grid.html
@@ -25,7 +25,7 @@
 
 <f:if condition="{containerGrid}">
     <f:comment>Backend\Preview\ContainerLayoutView (Fluid based page module)</f:comment>
-    <f:render partial="PageLayout/Grid" arguments="{grid: containerGrid, hideRestrictedColumns: hideRestrictedColumns, newContentTitle: newContentTitle, newContentTitleShort: newContentTitleShort, allowEditContent: allowEditContent}" />
+    <f:render partial="PageLayout/Grid" arguments="{grid: containerGrid, hideRestrictedColumns: hideRestrictedColumns, newContentTitle: newContentTitle, newContentTitleShort: newContentTitleShort, allowEditContent: allowEditContent, collapsable: 1}" />
 </f:if>
 
 </html>