diff --git a/template/app/controller/Tabs.js b/template/app/controller/Tabs.js
index 8d096aa757a890703bf3ba95d26ecb4df382a565..067be53126321901bc213dca794a5864cf7fe844 100644
--- a/template/app/controller/Tabs.js
+++ b/template/app/controller/Tabs.js
@@ -91,7 +91,7 @@ Ext.define('Docs.controller.Tabs', {
         });
 
         this.control({
-            'container [componentCls=doctabs]': {
+            '[componentCls=doctabs]': {
                 afterrender: function(cmp) {
                     this.addTabIconListeners(cmp);
                     this.addTabListeners(cmp);
@@ -107,7 +107,7 @@ Ext.define('Docs.controller.Tabs', {
                 },
                 scope: this
             },
-            '#tabOverflowMenu menuitem': {
+            '[componentCls=tab-menu] menuitem': {
                 click: function(cmp) {
                     Docs.History.push(cmp.href, { navigate: true });
                 },
diff --git a/template/app/view/TabMenu.js b/template/app/view/TabMenu.js
index ea8412842d272ef69114a66687e7a21aa0bdf09a..3fb0d37ed69b54c87651c6c78fec3499fb9e94b6 100644
--- a/template/app/view/TabMenu.js
+++ b/template/app/view/TabMenu.js
@@ -4,7 +4,7 @@
 Ext.define('Docs.view.TabMenu', {
     extend: 'Ext.menu.Menu',
     plain: true,
-    id: 'tabOverflowMenu',
+    componentCls: 'tab-menu',
 
     initComponent: function() {
         this.addEvents(
diff --git a/template/resources/sass/_tabs.scss b/template/resources/sass/_tabs.scss
index d5432e1281733ec1ef4776da3f9398ff7839f5c8..03607ed20355f6130f3ad8c0fc35a3fafa143451 100644
--- a/template/resources/sass/_tabs.scss
+++ b/template/resources/sass/_tabs.scss
@@ -132,7 +132,7 @@
       background: url(../images/tabs.png) no-repeat -7px -513px;
       border: 0; } } }
 
-#tabOverflowMenu {
+.tab-menu {
   .x-menu-item-link {
     padding-top: 5px; }
   .overflow {