diff --git a/web-src/src/components/IndexButtonList.vue b/web-src/src/components/IndexButtonList.vue
index 9719da95..4e5e76c8 100644
--- a/web-src/src/components/IndexButtonList.vue
+++ b/web-src/src/components/IndexButtonList.vue
@@ -1,7 +1,12 @@
 <template>
-  <nav class="buttons is-centered fd-is-square" style="margin-bottom: 64px;" v-if="filtered_index.length > 1">
-    <a v-for="char in filtered_index" :key="char" class="button is-small" @click="nav(char)">{{ char }}</a>
-  </nav>
+  <section>
+    <nav class="buttons is-centered fd-is-square" style="margin-bottom: 48px;" v-if="filtered_index.length > 1">
+      <a v-for="char in filtered_index" :key="char" class="button is-small" @click="nav(char)">{{ char }}</a>
+    </nav>
+    <nav class="buttons is-centered" style="margin-bottom: 6px;" v-if="filtered_index.length > 1">
+      <a class="button is-small is-white" @click="scroll_to_top"><span class="icon is-small"><i class="mdi mdi-chevron-up"></i></span></a>
+    </nav>
+  </section>
 </template>
 
 <script>
@@ -20,6 +25,10 @@ export default {
   methods: {
     nav: function (id) {
       this.$router.push({ path: this.$router.currentRoute.path + '#index_' + id })
+    },
+
+    scroll_to_top: function () {
+      window.scrollTo({ top: 0, behavior: 'smooth' })
     }
   }
 }
diff --git a/web-src/src/router/index.js b/web-src/src/router/index.js
index 09f57029..915d2689 100644
--- a/web-src/src/router/index.js
+++ b/web-src/src/router/index.js
@@ -58,25 +58,25 @@ export const router = new VueRouter({
       path: '/music/browse',
       name: 'Browse',
       component: PageBrowse,
-      meta: { show_progress: true }
+      meta: { show_progress: true, has_tabs: true }
     },
     {
       path: '/music/browse/recently_added',
       name: 'Browse Recently Added',
       component: PageBrowseRecentlyAdded,
-      meta: { show_progress: true }
+      meta: { show_progress: true, has_tabs: true }
     },
     {
       path: '/music/browse/recently_played',
       name: 'Browse Recently Played',
       component: PageBrowseRecentlyPlayed,
-      meta: { show_progress: true }
+      meta: { show_progress: true, has_tabs: true }
     },
     {
       path: '/music/artists',
       name: 'Artists',
       component: PageArtists,
-      meta: { show_progress: true, has_index: true }
+      meta: { show_progress: true, has_tabs: true, has_index: true }
     },
     {
       path: '/music/artists/:artist_id',
@@ -94,7 +94,7 @@ export const router = new VueRouter({
       path: '/music/albums',
       name: 'Albums',
       component: PageAlbums,
-      meta: { show_progress: true, has_index: true }
+      meta: { show_progress: true, has_tabs: true, has_index: true }
     },
     {
       path: '/music/albums/:album_id',
@@ -106,7 +106,7 @@ export const router = new VueRouter({
       path: '/music/genres',
       name: 'Genres',
       component: PageGenres,
-      meta: { show_progress: true, has_index: true }
+      meta: { show_progress: true, has_tabs: true, has_index: true }
     },
     {
       path: '/music/genres/:genre',
@@ -169,19 +169,19 @@ export const router = new VueRouter({
       path: '/music/spotify',
       name: 'Spotify',
       component: SpotifyPageBrowse,
-      meta: { show_progress: true }
+      meta: { show_progress: true, has_tabs: true }
     },
     {
       path: '/music/spotify/new-releases',
       name: 'Spotify Browse New Releases',
       component: SpotifyPageBrowseNewReleases,
-      meta: { show_progress: true }
+      meta: { show_progress: true, has_tabs: true }
     },
     {
       path: '/music/spotify/featured-playlists',
       name: 'Spotify Browse Featured Playlists',
       component: SpotifyPageBrowseFeaturedPlaylists,
-      meta: { show_progress: true }
+      meta: { show_progress: true, has_tabs: true }
     },
     {
       path: '/music/spotify/artists/:artist_id',
@@ -226,7 +226,11 @@ export const router = new VueRouter({
     } else if (to.meta.has_index) {
       return new Promise((resolve, reject) => {
         setTimeout(() => {
-          resolve({ selector: '#top', offset: { x: 0, y: 110 } })
+          if (to.meta.has_tabs) {
+            resolve({ selector: '#top', offset: { x: 0, y: 140 } })
+          } else {
+            resolve({ selector: '#top', offset: { x: 0, y: 100 } })
+          }
         }, 10)
       })
     } else {