diff --git a/src/layouts/HeaderAndVList.vue b/src/layouts/HeaderAndVList.vue
index 2f3c6dee..a2d79518 100644
--- a/src/layouts/HeaderAndVList.vue
+++ b/src/layouts/HeaderAndVList.vue
@@ -3,7 +3,7 @@
     <div
       v-bind="containerProps"
       style="height: calc(100vh - 4.25rem)"
-      :style="{ paddingTop: headerHeight - 64 + 16 + 'px' }"
+      :style="{ paddingTop: !no_header ? headerHeight - 64 + 16 + 'px' : 0 }"
       @scroll="handleScroll"
     >
       <div v-bind="wrapperProps" class="scrollable">
diff --git a/src/views/FolderView.vue b/src/views/FolderView.vue
index 9e43f05a..8aad37cb 100644
--- a/src/views/FolderView.vue
+++ b/src/views/FolderView.vue
@@ -1,7 +1,11 @@
 <template>
-  <Layout :tracks="folder.tracks" @playFromPage="playFromPage">
-    <template #header>
-      <FolderList :folders="folder.dirs" v-if="folder.dirs.length" />
+  <Layout
+    :tracks="folder.tracks"
+    :no_header="folder.dirs.length === 0"
+    @playFromPage="playFromPage"
+  >
+    <template #header v-if="folder.dirs.length">
+      <FolderList :folders="folder.dirs" />
     </template>
   </Layout>
 </template>