diff --git a/doc/menubar/RouterDoc.vue b/doc/menubar/RouterDoc.vue
index 003fb5457..cbe07429c 100644
--- a/doc/menubar/RouterDoc.vue
+++ b/doc/menubar/RouterDoc.vue
@@ -7,7 +7,7 @@
     </DocSectionText>
     <div class="card relative z-2">
         <Menubar :model="items">
-            <template #item="{ label, item, props, root }">
+            <template #item="{ label, item, props, root, hasSubmenu }">
                 <router-link v-if="item.route" v-slot="routerProps" :to="item.route" custom>
                     <a :href="routerProps.href" v-bind="props.action">
                         <span v-bind="props.icon" />
@@ -17,7 +17,7 @@
                 <a v-else :href="item.url" :target="item.target" v-bind="props.action">
                     <span v-bind="props.icon" />
                     <span v-bind="props.label">{{ label }}</span>
-                    <span :class="[root ? 'pi pi-fw pi-angle-down' : 'pi pi-fw pi-angle-right']" v-bind="props.submenuicon" />
+                    <span :class="[hasSubmenu && (root ? 'pi pi-fw pi-angle-down' : 'pi pi-fw pi-angle-right')]" v-bind="props.submenuicon" />
                 </a>
             </template>
         </Menubar>
diff --git a/doc/steps/RouterDoc.vue b/doc/steps/RouterDoc.vue
index cf5306066..6fdd4a451 100644
--- a/doc/steps/RouterDoc.vue
+++ b/doc/steps/RouterDoc.vue
@@ -5,7 +5,7 @@
             <i>NuxtLink</i> or <i>router-link</i>. Here is an example with vue-router.
         </p>
     </DocSectionText>
-    <div class="card">
+    <!-- <div class="card">
         <Steps
             :model="items"
             aria-label="Form Steps"
@@ -29,7 +29,7 @@
                 </a>
             </template>
         </Steps>
-    </div>
+    </div> -->
     <DocSectionCode :code="code" />
 </template>
 
diff --git a/doc/tabmenu/RouterDoc.vue b/doc/tabmenu/RouterDoc.vue
index 80adfc59f..eadcb3aa8 100644
--- a/doc/tabmenu/RouterDoc.vue
+++ b/doc/tabmenu/RouterDoc.vue
@@ -5,7 +5,7 @@
             <i>NuxtLink</i> or <i>router-link</i>. Here is an example with vue-router.
         </p>
     </DocSectionText>
-    <div class="card">
+    <!-- <div class="card">
         <TabMenu v-model:activeIndex="active" :model="items">
             <template #item="{ label, item, props }">
                 <router-link v-if="item.route" v-slot="routerProps" :to="item.route" custom>
@@ -21,7 +21,7 @@
             </template>
         </TabMenu>
         <router-view />
-    </div>
+    </div> -->
     <DocSectionCode :code="code" />
 </template>
 
@@ -280,14 +280,14 @@ export default {
                 ]
             }
         };
-    },
-    watch: {
-        $route() {
-            this.active = this.items.findIndex((item) => this.$route.path === this.$router.resolve(item.route).path);
-        }
-    },
-    mounted() {
-        this.active = this.items.findIndex((item) => this.$route.path === this.$router.resolve(item.route).path);
     }
+    // watch: {
+    //     $route() {
+    //         this.active = this.items.findIndex((item) => this.$route.path === this.$router.resolve(item.route).path);
+    //     }
+    // },
+    // mounted() {
+    //     this.active = this.items.findIndex((item) => this.$route.path === this.$router.resolve(item.route).path);
+    // }
 };
 </script>