diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php
index 7c52869b..29e5cda7 100644
--- a/resources/views/components/layouts/app.blade.php
+++ b/resources/views/components/layouts/app.blade.php
@@ -407,7 +407,7 @@
             @if($helpdeskEnabled || $documentationEnabled)
                 <div class="wms-sidebar-group" data-wms-menu-group="support">
                     @if(Route::has('helpdesk.index'))
-                        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-sidebar-label title="{{ __('Support') }}">
+                        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-heading wms-sidebar-heading-button @if(request()->routeIs('helpdesk.*')) is-active @endif" data-wms-sidebar-label title="{{ __('Support') }}">
                             <span class="wms-sidebar-heading-content">
                                 <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
                                 <span>{{ __('Support') }}</span>
@@ -677,8 +677,11 @@
 
         function groupHasActiveLink(group) {
             const items = getMenuItems(group);
+            const activeHeading = Array.from(group.children).some((child) => {
+                return child.matches('.wms-sidebar-heading-button.is-active');
+            });
 
-            return items ? items.querySelector('.wms-sidebar-link.is-active') !== null : false;
+            return activeHeading || (items ? items.querySelector('.wms-sidebar-link.is-active') !== null : false);
         }
 
         function setMenuGroupOpen(group, isOpen) {
@@ -937,7 +940,7 @@
                 button.addEventListener('click', closeMobileSidebar);
             });
 
-            document.querySelectorAll('.wms-sidebar-link[wire\\:navigate]').forEach((link) => {
+            document.querySelectorAll('.wms-sidebar-link[wire\\:navigate], .wms-sidebar-heading-button[wire\\:navigate]').forEach((link) => {
                 if (link.dataset.wmsMobileBound === '1') {
                     return;
                 }
@@ -945,7 +948,7 @@
                 link.dataset.wmsMobileBound = '1';
 
                 link.addEventListener('click', function () {
-                    document.querySelectorAll('.wms-sidebar-link.is-active').forEach((activeLink) => {
+                    document.querySelectorAll('.wms-sidebar-link.is-active, .wms-sidebar-heading-button.is-active').forEach((activeLink) => {
                         activeLink.classList.remove('is-active');
                     });
 
diff --git a/resources/views/layouts/app/sidebar.blade.php b/resources/views/layouts/app/sidebar.blade.php
index f77403d2..94e743d0 100644
--- a/resources/views/layouts/app/sidebar.blade.php
+++ b/resources/views/layouts/app/sidebar.blade.php
@@ -407,7 +407,7 @@
             @if($helpdeskEnabled || $documentationEnabled)
                 <div class="wms-sidebar-group" data-wms-menu-group="support">
                     @if(Route::has('helpdesk.index'))
-                        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-sidebar-label title="{{ __('Support') }}">
+                        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-heading wms-sidebar-heading-button @if(request()->routeIs('helpdesk.*')) is-active @endif" data-wms-sidebar-label title="{{ __('Support') }}">
                             <span class="wms-sidebar-heading-content">
                                 <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
                                 <span>{{ __('Support') }}</span>
@@ -800,8 +800,11 @@
 
         function groupHasActiveLink(group) {
             const items = getMenuItems(group);
+            const activeHeading = Array.from(group.children).some((child) => {
+                return child.matches('.wms-sidebar-heading-button.is-active');
+            });
 
-            return items ? items.querySelector('.wms-sidebar-link.is-active') !== null : false;
+            return activeHeading || (items ? items.querySelector('.wms-sidebar-link.is-active') !== null : false);
         }
 
         function setMenuGroupOpen(group, isOpen) {
@@ -1060,7 +1063,7 @@
                 button.addEventListener('click', closeMobileSidebar);
             });
 
-            document.querySelectorAll('.wms-sidebar-link[wire\\:navigate]').forEach((link) => {
+            document.querySelectorAll('.wms-sidebar-link[wire\\:navigate], .wms-sidebar-heading-button[wire\\:navigate]').forEach((link) => {
                 if (link.dataset.wmsMobileBound === '1') {
                     return;
                 }
@@ -1068,7 +1071,7 @@
                 link.dataset.wmsMobileBound = '1';
 
                 link.addEventListener('click', function () {
-                    document.querySelectorAll('.wms-sidebar-link.is-active').forEach((activeLink) => {
+                    document.querySelectorAll('.wms-sidebar-link.is-active, .wms-sidebar-heading-button.is-active').forEach((activeLink) => {
                         activeLink.classList.remove('is-active');
                     });