diff --git a/allianceauth/templates/allianceauth/base-bs5.html b/allianceauth/templates/allianceauth/base-bs5.html
index 2302e6b3..d96049f1 100644
--- a/allianceauth/templates/allianceauth/base-bs5.html
+++ b/allianceauth/templates/allianceauth/base-bs5.html
@@ -102,19 +102,24 @@
             (() => {
                 // TODO Move to own JS file
                 const sidebar = document.getElementById('sidebar');
+                const sidebarKey = `sidebar_${sidebar.id}`;
 
-                sidebar.addEventListener('shown.bs.collapse', () => {
-                    localStorage.removeItem(`sidebar_${sidebar.id}`);
+                sidebar.addEventListener('shown.bs.collapse', (event) => {
+                    if (event.target.id === sidebar.id) {
+                        localStorage.removeItem(sidebarKey);
+                    }
                 });
 
-                sidebar.addEventListener('hidden.bs.collapse', () => {
-                    localStorage.setItem(`sidebar_${sidebar.id}`, 'closed');
+                sidebar.addEventListener('hidden.bs.collapse', (event) => {
+                    if (event.target.id === sidebar.id) {
+                        localStorage.setItem(sidebarKey, 'closed');
+                    }
                 });
 
-                if (localStorage.getItem(`sidebar_${sidebar.id}`) === 'closed') {
-                    sidebar.classList.remove('show')
+                if (localStorage.getItem(sidebarKey) === 'closed') {
+                    sidebar.classList.remove('show');
                 } else {
-                    sidebar.classList.add("show")
+                    sidebar.classList.add('show');
                 }
 
                 const activeChildMenuItem = document.querySelector('#sidebar-menu li ul li a.active');
@@ -133,6 +138,7 @@
         </script>
 
         {% include 'bundles/jquery-js.html' %}
+
         {% theme_js %}
 
         {% if user.is_authenticated %}
@@ -148,6 +154,7 @@
 
         {% block extra_javascript %}
         {% endblock extra_javascript %}
+
         <script>
             {% block extra_script %}
             {% endblock extra_script %}