diff --git a/src/filemanager.html b/src/filemanager.html
index efc761d4d..b034550fb 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -229,8 +229,8 @@
           </div>
         </div>
 
-        <div style="overflow: auto;">
-          <table class="table table-hover" style="margin: 0;" ng-class="{ 'entry-hovered': dropToBody }">
+        <div class="file-list"ng-class="{ 'entry-hovered': dropToBody }">
+          <table class="table table-hover" style="margin: 0;">
             <thead>
               <tr>
                 <th style="width: 3%;">&nbsp;</th>
diff --git a/src/theme.scss b/src/theme.scss
index 2a88db089..95c2be2a0 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -1688,6 +1688,11 @@ tag-input {
 .filemanager {
 
     // those are for drag'n'drop
+    .file-list {
+        overflow: auto;
+        border: 2px solid transparent;
+    }
+
     table {
         border: 2px solid transparent;
     }