diff --git a/src/components/maintabsmanager.js b/src/components/maintabsmanager.js
index 656bfb05cd..7c8cce368d 100644
--- a/src/components/maintabsmanager.js
+++ b/src/components/maintabsmanager.js
@@ -139,19 +139,8 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
 
             var index = 0;
 
-            /*var tabsElement;
-            try {
-                tabsElement = document.createElement('div', {is: 'emby-tabs'});
-            } catch (err) {
-                // older browser not supporting options for createElement
-                tabsElement = document.createElement('div', 'emby-tabs');
-            }
-            if (selectedIndex != null) {
-                tabsElement.setAttribute('data-index', selectedIndex);
-            }
-            tabsElement.className = 'tabs-viewmenubar';
-            tabsElement.innerHTML = '<div class="emby-tabs-slider" style="white-space:nowrap;">' + getTabsFn().map(function (t) {*/
-            var html = '<div is="emby-tabs" ' + (selectedIndex != null ? 'data-index="' + selectedIndex + '" ' : '') + 'class="tabs-viewmenubar">' + '<div class="emby-tabs-slider" style="white-space:nowrap;">' + getTabsFn().map(function (t) {*/
+            var indexAttribute = selectedIndex == null ? '' : (' data-index="' + selectedIndex + '"');
+            var tabsHtml = '<div is="emby-tabs"' + indexAttribute + ' class="tabs-viewmenubar"><div class="emby-tabs-slider" style="white-space:nowrap;">' + getTabsFn().map(function (t) {
 
                 var tabClass = 'emby-tab-button';
 
@@ -176,11 +165,8 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
 
             }).join('') + '</div></div>';
 
-            /*while (tabsContainerElem.children.length != 0) {
-                tabsContainerElem.removeChild(tabsContainerElem.children[0]);
-            }
-            tabsContainerElem.appendChild(tabsElement);*/
-            tabsContainerElem.innerHTML = html;
+            tabsContainerElem.innerHTML = tabsHtml;
+            CustomElements.upgradeSubtree(tabsContainerElem);
 
             document.body.classList.add('withSectionTabs');
             tabOwnerView = view;
diff --git a/src/scripts/site.js b/src/scripts/site.js
index fb9043aa2d..5ce093e628 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -709,10 +709,7 @@ var AppInfo = {};
             onError: onRequireJsError
         });
 
-        require(["fetch"], function (fetch) {
-            console.debug("fetch is here", fetch);
-        });
-
+        require(["fetch"]);
         require(["polyfill"]);
         require(["fast-text-encoding"]);
         require(["intersection-observer"]);