diff --git a/template/app/controller/Classes.js b/template/app/controller/Classes.js
index 478c447f4b3b5ebccc302715f30db1803789b062..4ee62500a3b9561ac3f1c63ed6f102a9b684093b 100644
--- a/template/app/controller/Classes.js
+++ b/template/app/controller/Classes.js
@@ -6,7 +6,8 @@ Ext.define('Docs.controller.Classes', {
 
     requires: [
         'Docs.History',
-        'Docs.Syntax'
+        'Docs.Syntax',
+        'Docs.view.cls.Overview'
     ],
 
     stores: [
@@ -164,12 +165,16 @@ Ext.define('Docs.controller.Classes', {
                 classOverview = classCnt.down('classoverview');
 
             classHeader.load(cls);
-            classOverview.load(cls);
 
-            if (this.getTabPanel()) {
+            // Init overview tab if not already available
+            if (!classOverview) {
+                classOverview = Ext.create('Docs.view.cls.Overview');
+                this.getTabPanel().add(classOverview);
                 this.getTabPanel().setActiveTab(0);
-                this.getTabPanel().setLoading(false);
             }
+            classOverview.load(cls);
+
+            this.getTabPanel().setLoading(false);
 
             this.getTree().selectClass(cls.name);
             this.fireEvent('showClass', cls.name);
diff --git a/template/app/view/cls/Container.js b/template/app/view/cls/Container.js
index cae2c745bb8d3983bf5cf0d02f76d82b1aa612e0..9ae3f205035aa7a0d70c41490091386221a09f19 100644
--- a/template/app/view/cls/Container.js
+++ b/template/app/view/cls/Container.js
@@ -19,7 +19,6 @@ Ext.define('Docs.view.cls.Container', {
         this.items = [
             Ext.create('Docs.view.cls.Header'),
             Ext.create('Docs.view.cls.TabPanel', {
-                docClass: this.docClass,
                 flex: 1
             })
         ];
diff --git a/template/app/view/cls/TabPanel.js b/template/app/view/cls/TabPanel.js
index 6ce54ec0c3097f2a2eeba882c64f863ab1165977..316a494ddbd7eb149e02d56dbbc7587aa56ccec8 100644
--- a/template/app/view/cls/TabPanel.js
+++ b/template/app/view/cls/TabPanel.js
@@ -21,15 +21,6 @@ Ext.define('Docs.view.cls.TabPanel', {
                 newCard.body.scrollTo('top', newCard.prevScroll);
             }
         }
-    },
-
-    initComponent: function() {
-        this.items = [
-            Ext.create('Docs.view.cls.Overview', {
-                docClass: this.docClass
-            })
-        ];
-
-        this.callParent(arguments);
     }
+
 });