diff --git a/doc/configuration/UnstyledDoc.vue b/doc/configuration/UnstyledDoc.vue
index c795cd06f..b796f7bfb 100644
--- a/doc/configuration/UnstyledDoc.vue
+++ b/doc/configuration/UnstyledDoc.vue
@@ -2,7 +2,7 @@
     <DocSectionText v-bind="$attrs">
         <p>
             Unstyled mode instructs the components not to add any built-in style classes so that they can be styled using custom css or libraries like Tailwind, Bootstrap or PrimeFlex. Visit
-            <NuxtLink to="/unstyled">Unstyled mode</NuxtLink> documentation for more information.
+            <NuxtLink to="/theming/unstyled">Unstyled mode</NuxtLink> documentation for more information.
         </p>
 
         <DocSectionCode :code="code" hideToggleCode importCode hideStackBlitz />
diff --git a/layouts/AppMenuItem.vue b/layouts/AppMenuItem.vue
index ff00d8361..14857874b 100644
--- a/layouts/AppMenuItem.vue
+++ b/layouts/AppMenuItem.vue
@@ -15,6 +15,7 @@
             <span>{{ menuitem.name }}</span>
             <Tag v-if="menuitem.badge" :value="menuitem.badge"></Tag>
         </a>
+
         <PrimeVueNuxtLink v-if="menuitem.to" :to="menuitem.to" :class="{ 'router-link-active': menuitem.to === $route.fullPath }">
             <span v-if="menuitem.icon && root" class="menu-icon">
                 <i :class="menuitem.icon"></i>
@@ -47,7 +48,8 @@ export default {
     methods: {
         isActiveRootmenuItem(menuitem) {
             return (
-                menuitem.children && !menuitem.children.some((item) => item.to === `/${this.$router.currentRoute.value?.name?.replace('-', '/')}` || (item.children && item.children.some((it) => it.to === `/${this.$router.currentRoute.value.name}`)))
+                menuitem.children &&
+                !menuitem.children.some((item) => item.to === `/${this.$router.currentRoute.value?.name?.replaceAll('-', '/')}` || (item.children && item.children.some((it) => it.to === `/${this.$router.currentRoute.value.name}`)))
             );
         }
     }