diff --git a/customize.dist/src/less2/include/fileupload.less b/customize.dist/src/less2/include/fileupload.less
index ebe93399b..91117fedd 100644
--- a/customize.dist/src/less2/include/fileupload.less
+++ b/customize.dist/src/less2/include/fileupload.less
@@ -17,6 +17,8 @@
         z-index: 1000000; //Z file upload table container
         display: none;
         color: darken(@colortheme_drive-bg, 10%);
+        max-height: 180px;
+        overflow-y: auto;
 
         @media screen and (max-width: @browser_media-medium-screen) {
             left: 5vw; right: 5vw; bottom: 5vw;
@@ -26,6 +28,9 @@
             display: flex;
             background-color: darken(@colortheme_modal-bg, 10%);
             font-weight: bold;
+            position: sticky;
+            top: 0;
+            z-index: 1;
             .cp-fileupload-header-title {
                 padding: 0.25em 0.5em;
                 flex-grow: 1;
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index c7ca340a6..09f501df7 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -227,7 +227,7 @@ define([
             var $tr = $('<tr>', {id: id}).appendTo($table);
             var $lines = $table.find('tr[id]');
             if ($lines.length > 5) {
-                $lines.slice(0, $lines.length - 5).remove();
+                //$lines.slice(0, $lines.length - 5).remove();
             }
 
             var $cancel = $('<span>', {'class': 'cp-fileupload-table-cancel-button fa fa-times'}).click(function () {