diff --git a/src/App.vue b/src/App.vue
index 633046367..c3f29bdb4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -28,6 +28,7 @@ export default {
     watch: {
         $route() {
             this.sidebarActive = false;
+            this.$toast.removeAllGroups();
         }
     },
     methods: {
diff --git a/src/views/tabview/TabViewDemo.vue b/src/views/tabview/TabViewDemo.vue
index b758ea60f..80291542d 100644
--- a/src/views/tabview/TabViewDemo.vue
+++ b/src/views/tabview/TabViewDemo.vue
@@ -29,8 +29,8 @@
 
             <h3>Programmatic</h3>
             <div style="padding: .5em 0">
-                <p-button icon="pi pi-chevron-left" @click="prev" class="p-button-secondary" />
-                <p-button icon="pi pi-chevron-right" @click="next" style="margin-left: .5em" class="p-button-secondary"/>
+                <Button icon="pi pi-chevron-left" @click="prev" class="p-button-secondary" />
+                <Button icon="pi pi-chevron-right" @click="next" style="margin-left: .5em" class="p-button-secondary"/>
             </div>
 
             <TabView>