diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 2d8f42cc94..c2be846da9 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -1,4 +1,4 @@
-<div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage" data-require="emby-collapsible,scripts/librarysettings,paper-input,paper-checkbox">
+<div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage withTabs" data-require="emby-collapsible,scripts/librarysettings,paper-input,paper-checkbox">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/scripts/librarypathmapping.js b/dashboard-ui/scripts/librarypathmapping.js
index 45a2471d60..61a401d5cf 100644
--- a/dashboard-ui/scripts/librarypathmapping.js
+++ b/dashboard-ui/scripts/librarypathmapping.js
@@ -121,9 +121,14 @@
          {
              href: 'librarypathmapping.html',
              name: Globalize.translate('TabPathSubstitution')
+         },
+         {
+             href: 'librarysettings.html',
+             name: Globalize.translate('TabAdvanced')
          }];
     }
 
+
     $(document).on('pageinit', "#libraryPathMappingPage", function () {
 
         var page = this;
diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/scripts/librarysettings.js
index c934ebf154..234d81e268 100644
--- a/dashboard-ui/scripts/librarysettings.js
+++ b/dashboard-ui/scripts/librarysettings.js
@@ -164,8 +164,25 @@
         return false;
     }
 
+    function getTabs() {
+        return [
+        {
+            href: 'library.html',
+            name: Globalize.translate('TabFolders')
+        },
+         {
+             href: 'librarypathmapping.html',
+             name: Globalize.translate('TabPathSubstitution')
+         },
+         {
+             href: 'librarysettings.html',
+             name: Globalize.translate('TabAdvanced')
+         }];
+    }
+
     $(document).on('pageshow', "#librarySettingsPage", function () {
 
+        LibraryMenu.setTabs('librarysetup', 2, getTabs);
         Dashboard.showLoadingMsg();
 
         var page = this;
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index e33b4b4fc1..64b2bcce99 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -222,7 +222,7 @@
     }
 
     function editImages(page, virtualFolder) {
-        
+
         require(['components/imageeditor/imageeditor'], function (ImageEditor) {
 
             ImageEditor.show(virtualFolder.ItemId, {
@@ -462,6 +462,10 @@
          {
              href: 'librarypathmapping.html',
              name: Globalize.translate('TabPathSubstitution')
+         },
+         {
+             href: 'librarysettings.html',
+             name: Globalize.translate('TabAdvanced')
          }];
     }
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 821af32803..04b419873a 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -757,11 +757,6 @@ var Dashboard = {
             href: "metadatasubtitles.html",
             pageIds: ['metadataSubtitlesPage'],
             icon: 'closed-caption'
-        }, {
-            name: Globalize.translate('TabAdvanced'),
-            href: "librarysettings.html",
-            pageIds: ['librarySettingsPage'],
-            icon: 'settings'
         }, {
             name: Globalize.translate('TabPlayback'),
             icon: 'play-circle-filled',