diff --git a/src/components/tabview/TabView.vue b/src/components/tabview/TabView.vue
index f47c5b959..b2414f2ff 100644
--- a/src/components/tabview/TabView.vue
+++ b/src/components/tabview/TabView.vue
@@ -1,4 +1,33 @@
+<template>
+    <div class="p-tabview p-component p-tabview-top">
+        <ul class="p-tabview-nav p-reset" role="tablist">
+            <li role="presentation" v-for="(tab, i) of tabs" :key="tab.header || i" :class="['p-unselectable-text', {'p-highlight': (tab.d_active), 'p-disabled': tab.disabled}]">
+                <a role="tab" @click="onTabClick($event, tab)" @keydown="onTabKeydown($event, tab)" :tabindex="tab.disabled ? null : '0'">
+                    <span class="p-tabview-title" v-if="tab.header">{{tab.header}}</span>
+                    <TabHeaderSlot :tab="tab" v-if="tab.$scopedSlots.header" />
+                </a>
+            </li>
+        </ul>
+        <div class="p-tabview-panels">
+            <slot></slot>
+        </div>
+    </div>
+</template>
+
 <script>
+const TabHeaderSlot = {
+    functional: true,
+    props: {
+        tab: {
+            type: null,
+            default: null
+        }
+    },
+    render(createElement, context) {
+        return [context.props.tab.$scopedSlots['header']()];
+    }
+};
+
 export default {
     data() {
         return {
@@ -49,28 +78,8 @@ export default {
             return activeTab;
         }
     },
-    render() {
-        return (
-            <div class="p-tabview p-component p-tabview-top">
-                <ul class="p-tabview-nav p-reset" role="tablist">
-                    {
-                        this.tabs.map(tab => {
-                            return (
-                                <li role="presentation" key={tab.header} class={['p-unselectable-text', {'p-highlight': (tab.d_active), 'p-disabled': tab.disabled}]}>
-                                     <a role="tab" on-click={event => this.onTabClick(event, tab)} on-keydown={event => this.onTabKeydown(event, tab)} tabindex={tab.disabled ? null : '0'}>
-                                        {tab.header && <span class="p-tabview-title">{tab.header}</span>}
-                                        {tab.$slots.header}
-                                    </a>
-                                </li>
-                            );
-                        })
-                    }
-                </ul>
-                <div class="p-tabview-panels">
-                    {this.$slots.default}
-                </div>
-            </div>
-        );
+    components: {
+        'TabHeaderSlot': TabHeaderSlot
     }
 }
 </script>
diff --git a/src/views/tabview/TabViewDemo.vue b/src/views/tabview/TabViewDemo.vue
index b152c7517..21d4f321f 100644
--- a/src/views/tabview/TabViewDemo.vue
+++ b/src/views/tabview/TabViewDemo.vue
@@ -30,8 +30,8 @@
             <h3>Programmatic</h3>
             <div style="padding: .5em 0">
                 <Button @click="activate(0)" class="p-button-secondary" label="Activate 1st" />
-                <Button @click="activate(1)" class="p-button-secondary" label="Activate 2st" />
-                <Button @click="activate(2)" class="p-button-secondary" label="Activate 3st" />
+                <Button @click="activate(1)" class="p-button-secondary" label="Activate 2nd" />
+                <Button @click="activate(2)" class="p-button-secondary" label="Activate 3rd" />
             </div>
 
             <TabView>
diff --git a/src/views/tabview/TabViewDoc.vue b/src/views/tabview/TabViewDoc.vue
index b3f5cdd4d..226c8ddab 100644
--- a/src/views/tabview/TabViewDoc.vue
+++ b/src/views/tabview/TabViewDoc.vue
@@ -258,8 +258,8 @@ export default {
 &lt;h3&gt;Programmatic&lt;/h3&gt;
 &lt;div style="padding: .5em 0"&gt;
     &lt;Button @click="activate(0)" class="p-button-secondary" label="Activate 1st" /&gt;
-    &lt;Button @click="activate(1)" class="p-button-secondary" label="Activate 2st" /&gt;
-    &lt;Button @click="activate(2)" class="p-button-secondary" label="Activate 3st" /&gt;
+    &lt;Button @click="activate(1)" class="p-button-secondary" label="Activate 2nd" /&gt;
+    &lt;Button @click="activate(2)" class="p-button-secondary" label="Activate 3rd" /&gt;
 &lt;/div&gt;
 
 &lt;TabView&gt;