diff --git a/template/app/controller/Content.js b/template/app/controller/Content.js
index 6218cefa2d2e4d773fb0a209127c28c44e1ce182..d164e233b3e2ca7aa3a2c41d42316ba4d7e0ad0d 100644
--- a/template/app/controller/Content.js
+++ b/template/app/controller/Content.js
@@ -19,6 +19,16 @@ Ext.define('Docs.controller.Content', {
     title: "",
 
     onLaunch: function() {
+        var cmp = this.getIndex();
+        if (cmp.rendered) {
+            this.initScrollListener();
+        }
+        else {
+            cmp.on('afterrender', this.initScrollListener, this);
+        }
+    },
+
+    initScrollListener: function() {
         this.getIndex().getEl().addListener('scroll', function(cmp, el) {
             this.setScrollState(this.baseUrl, el.scrollTop);
         }, this);
diff --git a/template/app/view/Viewport.js b/template/app/view/Viewport.js
index 5726dba2e0b8651726882b2de122080b1435de70..46a158d1e6e4dfd7d0b4c7592e366d2f4369b1e3 100644
--- a/template/app/view/Viewport.js
+++ b/template/app/view/Viewport.js
@@ -80,8 +80,10 @@ Ext.define('Docs.view.Viewport', {
                             id: 'card-panel',
                             cls: 'card-panel',
                             xtype: 'container',
-                            layout: 'card',
-                            deferredRender: true,
+                            layout: {
+                                type: 'card',
+                                deferredRender: true
+                            },
                             items: [
                                 {
                                     autoScroll: true,