diff --git a/www/drive/file.less b/www/drive/file.less
index 7dcb8f9f9..0a0ca7151 100644
--- a/www/drive/file.less
+++ b/www/drive/file.less
@@ -538,8 +538,10 @@ span {
                 padding: 0 5px;
                 display: table-cell;
             }
-        }
-        li {
+            &:not(.header) {
+                height: @toolbar-line-height;
+                line-height: @toolbar-line-height;
+            }
             &.header {
                 cursor: default;
                 color: @table-header-fg;
diff --git a/www/drive/main.js b/www/drive/main.js
index d785cd6fc..f8e518987 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1650,8 +1650,10 @@ define([
         // and they don't hav a hierarchical structure (folder/subfolders)
         var displayHrefArray = function ($container, rootName, draggable) {
             var unsorted = files[rootName];
-            var $fileHeader = getFileListHeader(false);
-            $container.append($fileHeader);
+            if (unsorted.length) {
+                var $fileHeader = getFileListHeader(false);
+                $container.append($fileHeader);
+            }
             var keys = unsorted;
             var sortBy = Cryptpad.getLSAttribute(SORT_FILE_BY);
             sortBy = sortBy === "" ? sortBy = 'name' : sortBy;