diff --git a/assets/layout/admin-shell.js b/assets/layout/admin-shell.js
index 2c0aaac..1694174 100644
--- a/assets/layout/admin-shell.js
+++ b/assets/layout/admin-shell.js
@@ -1,8 +1,14 @@
 const STORAGE_KEY = 'sfs-components:admin-sidebar-collapsed';
 const COLLAPSED_CLASS = 'sfs-admin-sidebar-collapsed';
 
+function getClassTargets() {
+    return [document.documentElement, document.body].filter(Boolean);
+}
+
 function setCollapsed(collapsed) {
-    document.body.classList.toggle(COLLAPSED_CLASS, collapsed);
+    getClassTargets().forEach((target) => {
+        target.classList.toggle(COLLAPSED_CLASS, collapsed);
+    });
 }
 
 function isDesktop() {
@@ -10,16 +16,23 @@ function isDesktop() {
 }
 
 function readStoredState() {
-    return window.localStorage.getItem(STORAGE_KEY) === '1';
+    try {
+        return window.localStorage.getItem(STORAGE_KEY) === '1';
+    } catch (error) {
+        return false;
+    }
 }
 
 function writeStoredState(collapsed) {
-    window.localStorage.setItem(STORAGE_KEY, collapsed ? '1' : '0');
+    try {
+        window.localStorage.setItem(STORAGE_KEY, collapsed ? '1' : '0');
+    } catch (error) {
+    }
 }
 
 function syncState() {
     if (!isDesktop()) {
-        document.body.classList.remove(COLLAPSED_CLASS);
+        setCollapsed(false);
         return;
     }
 
@@ -31,12 +44,21 @@ function handleToggle() {
         return;
     }
 
-    const collapsed = !document.body.classList.contains(COLLAPSED_CLASS);
+    const collapsed = !document.documentElement.classList.contains(COLLAPSED_CLASS);
     setCollapsed(collapsed);
     writeStoredState(collapsed);
 }
 
+syncState();
+
 function initSidebarToggles() {
+    if (window.sfsAdminSidebarInitialized) {
+        syncState();
+        return;
+    }
+
+    window.sfsAdminSidebarInitialized = true;
+
     document.querySelectorAll('[data-sfs-admin-sidebar-toggle="desktop"]').forEach((button) => {
         if (button.dataset.sfsAdminSidebarBound === '1') {
             return;
diff --git a/templates/layout/admin.bootstrap5.html.twig b/templates/layout/admin.bootstrap5.html.twig
index 6283609..4bca6a0 100644
--- a/templates/layout/admin.bootstrap5.html.twig
+++ b/templates/layout/admin.bootstrap5.html.twig
@@ -19,6 +19,22 @@
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
 {% endblock %}
 
+{% block body_begin %}
+    <script>
+        (function () {
+            try {
+                if (
+                    window.matchMedia('(min-width: 992px)').matches
+                    && window.localStorage.getItem('sfs-components:admin-sidebar-collapsed') === '1'
+                ) {
+                    document.body.classList.add('sfs-admin-sidebar-collapsed');
+                }
+            } catch (error) {
+            }
+        })();
+    </script>
+{% endblock body_begin %}
+
 {% block body %}
     <div class="sfs-admin-shell d-flex vh-100 overflow-hidden">
         <aside id="sfs-admin-sidebar" class="sfs-admin-sidebar offcanvas-lg offcanvas-start border-end flex-shrink-0 h-100" tabindex="-1" aria-labelledby="sfs-admin-sidebar-title">