diff --git a/src/filemanager.html b/src/filemanager.html
index 88b2ec661..9c5ad8d5e 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -315,29 +315,34 @@
           </div>
         </div>
 
-        <div class="file-list" ng-class="{ 'entry-hovered': dropToBody, 'busy': busy }">
-          <table class="table table-hover" style="margin: 0;">
+        <div class="file-list-header">
+          <table class="table" style="margin: 0;">
             <thead>
               <tr>
-                <th style="width: 3%;">&nbsp;</th>
-                <th style="width:82%">Name</th>
-                <th style="width:10%">Size</th>
-                <th style="width:10%">Owner</th>
-                <th style="width: 5%">&nbsp;</th>
+                <th style="width: 40px;">&nbsp;</th>
+                <th style="">Name</th>
+                <th style="width: 80px">Size</th>
+                <th style="width:100px">Owner</th>
+                <th style="width: 40px">&nbsp;</th>
               </tr>
             </thead>
+          </table>
+        </div>
+
+        <div class="file-list" ng-class="{ 'entry-hovered': dropToBody, 'busy': busy }">
+          <table class="table table-hover" style="margin: 0;">
             <tbody>
               <tr ng-show="entries.length === 0">
                 <td colspan="5" class="text-center">No files</td>
               </tr>
               <tr ng-repeat="entry in entries | orderBy:sortProperty:sortAsc | orderBy:'isDirectory':true" draggable="true" ng-dragstart="dragStart($event, entry)" ng-drop="drop($event, entry)" context-menu="menuOptions" model="entry" ng-dragleave="dragExit($event, entry)" ng-dragover="dragEnter($event, entry)" ng-class="{ 'entry-hovered': entry.hovered }">
-                <td ng-click="open(entry)" ng-class="{ 'hand': !entry.isSymbolicLink }" class="text-center">
+                <td style="width: 40px" ng-click="open(entry)" ng-class="{ 'hand': !entry.isSymbolicLink }" class="text-center">
                   <i class="fas fa-lg {{ entry.icon }}" ng-class="{ 'text-primary': entry.isDirectory }"></i>
                 </td>
                 <td ng-class="{ 'hand': !entry.isSymbolicLink }" class="elide-table-cell" ng-click="open(entry)">{{ entry.fileName }}<span ng-show="entry.isSymbolicLink" class="text-muted" style="margin-left: 20px;">symlink to {{ entry.target }}</span></td>
-                <td ng-class="{ 'hand': !entry.isSymbolicLink }" class="elide-table-cell" ng-click="open(entry)">{{ entry.size | prettyByteSize }}</td>
-                <td ng-class="{ 'hand': !entry.isSymbolicLink }" class="elide-table-cell" ng-click="open(entry)">{{ entry.uid | prettyOwner }}</td>
-                <td class="text-right no-wrap" style="vertical-align: bottom">
+                <td style="width: 80px" ng-class="{ 'hand': !entry.isSymbolicLink }" class="elide-table-cell" ng-click="open(entry)">{{ entry.size | prettyByteSize }}</td>
+                <td style="width:100px" ng-class="{ 'hand': !entry.isSymbolicLink }" class="elide-table-cell" ng-click="open(entry)">{{ entry.uid | prettyOwner }}</td>
+                <td style="width: 40px" class="text-right no-wrap" style="vertical-align: bottom">
                   <button class="btn btn-xs btn-link" context-menu="menuOptions" model="entry" context-menu-on="click"><i class="fas fa-bars"></i></button>
                 </td>
               </tr>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 43a13c6eb..c9e15a7cb 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -751,6 +751,11 @@ app.controller('FileManagerController', ['$scope', '$timeout', 'Client', functio
         });
     });
 
+    $('.file-list').on('scroll', function (event) {
+        if (event.target.scrollTop > 10) event.target.classList.add('top-scroll-indicator');
+        else event.target.classList.remove('top-scroll-indicator');
+    });
+
     // setup all the dialog focus handling
     ['newFileModal', 'newDirectoryModal', 'renameEntryModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
diff --git a/src/theme.scss b/src/theme.scss
index 586abc743..3683d84d8 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -1722,10 +1722,26 @@ tag-input {
     .file-list {
         overflow: auto;
         border: 2px solid transparent;
+        position: relative;
 
         &.busy {
             opacity: 0.5;
         }
+
+        &.top-scroll-indicator {
+            transition: box-shadow 200ms;
+            box-shadow: inset 0 10px 10px -10px rgba(0,0,0,0.5);
+        }
+
+        .table-hover > tbody > tr:hover {
+            background-color: #0000000a;
+        }
+    }
+
+    .file-list-header {
+        th {
+            padding: 2px 8px;
+        }
     }
 
     table {