diff --git a/Oqtane.Client/UI/ContainerBuilder.razor b/Oqtane.Client/UI/ContainerBuilder.razor
index 98d8702f..d8a557c5 100644
--- a/Oqtane.Client/UI/ContainerBuilder.razor
+++ b/Oqtane.Client/UI/ContainerBuilder.razor
@@ -1,6 +1,6 @@
 @namespace Oqtane.UI
 
-<CascadingValue Value="@ModuleState" IsFixed="@(!PageState.EditMode)">
+<CascadingValue Value="@ModuleState" IsFixed="@(!UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))">
     @if (_useadminborder)
     {
         <div class="app-pane-admin-border">