diff --git a/resources/assets/stylesheets/less/files.less b/resources/assets/stylesheets/less/files.less
index 0f0f9886891ae9459b08193b716a89644ab7ee5a..ffa72e4524d667e242658c3834aa665858002f2a 100644
--- a/resources/assets/stylesheets/less/files.less
+++ b/resources/assets/stylesheets/less/files.less
@@ -95,13 +95,6 @@
     }
 }
 
-.subfolders .empty {
-    display: none;
-    &:only-child {
-        display: table-row;
-    }
-}
-
 /* for file/edit view and file/new_edit_folder_form view: */
 div.file_select_possibilities, .folder_type_select_possibilities {
     @width: 100px;
diff --git a/resources/vue/components/FilesTable.vue b/resources/vue/components/FilesTable.vue
index 6d6eff3dc49eb31561eb25ba9a08e00a1168064f..88abdeca723b8805d8fc1fde58991bb3ff8b7ab0 100644
--- a/resources/vue/components/FilesTable.vue
+++ b/resources/vue/components/FilesTable.vue
@@ -95,17 +95,21 @@
                     <th data-sort="false">{{ $gettext('Aktionen') }}</th>
                 </tr>
             </thead>
-            <tbody class="subfolders">
-                <tr v-if="!hasData" class="empty">
+            <tbody v-if="!hasData">
+                <tr class="empty">
                     <td :colspan="numberOfColumns">
                         {{ $gettext('Dieser Ordner ist leer') }}
                     </td>
                 </tr>
-                <tr v-else-if="displayedFolders.length + displayedFiles.length === 0" class="empty">
+            </tbody>
+            <tbody v-else-if="displayedFolders.length + displayedFiles.length === 0">
+                <tr class="empty">
                     <td :colspan="numberOfColumns">
                         <translate>Keine Ordner oder Dateien entsprechen Ihrem Filter.</translate>
                     </td>
                 </tr>
+            </tbody>
+            <tbody class="subfolders" v-if="displayedFolders.length > 0">
                 <tr v-for="folder in displayedFolders"
                     :id="'row_folder_' + folder.id "
                     :data-permissions="folder.permissions">
@@ -150,7 +154,7 @@
                     </td>
                 </tr>
             </tbody>
-            <tbody class="files">
+            <tbody class="files" v-if="displayedFiles.length > 0">
                 <tr v-for="file in displayedFiles"
                     :class="file.new ? 'new' : ''"
                     :id="'fileref_' + file.id"