diff --git a/web-src/src/components/TabsAudiobooks.vue b/web-src/src/components/TabsAudiobooks.vue
index 13375fed..a4a3aabf 100644
--- a/web-src/src/components/TabsAudiobooks.vue
+++ b/web-src/src/components/TabsAudiobooks.vue
@@ -14,7 +14,7 @@
               <router-link tag="li" to="/audiobooks/albums" active-class="is-active">
                 <a>
                   <span class="icon is-small"><i class="mdi mdi-album"></i></span>
-                  <span class="">Albums</span>
+                  <span class="">Audiobooks</span>
                 </a>
               </router-link>
             </ul>
diff --git a/web-src/src/pages/PageAlbums.vue b/web-src/src/pages/PageAlbums.vue
index f104f0ae..5355cef4 100644
--- a/web-src/src/pages/PageAlbums.vue
+++ b/web-src/src/pages/PageAlbums.vue
@@ -80,8 +80,7 @@ export default {
 
   watch: {
     'hide_singles' () {
-      this.index_list = [...new Set(this.albums.items
-        .filter(album => !this.$store.state.hide_singles || album.track_count > 2)
+      this.index_list = [...new Set(this.albums_filtered
         .map(album => album.name_sort.charAt(0).toUpperCase()))]
     }
   }
diff --git a/web-src/src/pages/PageArtists.vue b/web-src/src/pages/PageArtists.vue
index 7b959943..16091c28 100644
--- a/web-src/src/pages/PageArtists.vue
+++ b/web-src/src/pages/PageArtists.vue
@@ -61,8 +61,7 @@ export default {
     },
 
     index_list () {
-      return [...new Set(this.artists.items
-        .filter(artist => !this.$store.state.hide_singles || artist.track_count > (artist.album_count * 2))
+      return [...new Set(this.artists_filtered
         .map(artist => artist.name_sort.charAt(0).toUpperCase()))]
     },
 
diff --git a/web-src/src/pages/PageAudiobooksAlbums.vue b/web-src/src/pages/PageAudiobooksAlbums.vue
index 0696658e..3e1e8c33 100644
--- a/web-src/src/pages/PageAudiobooksAlbums.vue
+++ b/web-src/src/pages/PageAudiobooksAlbums.vue
@@ -3,6 +3,9 @@
     <tabs-audiobooks></tabs-audiobooks>
 
     <content-with-heading>
+      <template slot="options">
+        <index-button-list :index="index_list"></index-button-list>
+      </template>
       <template slot="heading-left">
         <p class="title is-4">Audiobooks</p>
         <p class="heading">{{ albums.total }} audiobooks</p>
@@ -17,6 +20,7 @@
 <script>
 import { LoadDataBeforeEnterMixin } from './mixin'
 import TabsAudiobooks from '@/components/TabsAudiobooks'
+import IndexButtonList from '@/components/IndexButtonList'
 import ContentWithHeading from '@/templates/ContentWithHeading'
 import ListAlbums from '@/components/ListAlbums'
 import webapi from '@/webapi'
@@ -34,7 +38,7 @@ const albumsData = {
 export default {
   name: 'PageAudiobooksAlbums',
   mixins: [LoadDataBeforeEnterMixin(albumsData)],
-  components: { TabsAudiobooks, ContentWithHeading, ListAlbums },
+  components: { TabsAudiobooks, ContentWithHeading, IndexButtonList, ListAlbums },
 
   data () {
     return {
@@ -42,6 +46,13 @@ export default {
     }
   },
 
+  computed: {
+    index_list () {
+      return [...new Set(this.albums.items
+        .map(album => album.name_sort.charAt(0).toUpperCase()))]
+    }
+  },
+
   methods: {
   }
 }
diff --git a/web-src/src/pages/PageAudiobooksArtists.vue b/web-src/src/pages/PageAudiobooksArtists.vue
index 3d94cc6a..4121c8a5 100644
--- a/web-src/src/pages/PageAudiobooksArtists.vue
+++ b/web-src/src/pages/PageAudiobooksArtists.vue
@@ -51,7 +51,6 @@ export default {
   computed: {
     index_list () {
       return [...new Set(this.artists.items
-        .filter(artist => !this.$store.state.hide_singles || artist.track_count > (artist.album_count * 2))
         .map(artist => artist.name_sort.charAt(0).toUpperCase()))]
     }
   },
diff --git a/web-src/src/router/index.js b/web-src/src/router/index.js
index 677dc5a5..bb97d7f5 100644
--- a/web-src/src/router/index.js
+++ b/web-src/src/router/index.js
@@ -160,7 +160,7 @@ export const router = new VueRouter({
       path: '/audiobooks/albums',
       name: 'AudiobooksAlbums',
       component: PageAudiobooksAlbums,
-      meta: { show_progress: true, has_tabs: true }
+      meta: { show_progress: true, has_tabs: true, has_index: true }
     },
     {
       path: '/audiobooks/:album_id',