diff --git a/htdocs/css/general.css b/htdocs/css/general.css
index a6880ef..b23b2db 100644
--- a/htdocs/css/general.css
+++ b/htdocs/css/general.css
@@ -42,6 +42,17 @@ div.footer {
     margin: 0;
 }
 
+div.fill {
+    display: flex;
+    flex-direction: column;
+    min-height: 76.6vh;
+    max-height: 76.6vh;       /* body takes whole viewport's height */
+}
+
+.fill-content {
+    flex: 1;                 /* this will make the container take the free space */
+}
+
 .padded {
     padding-top: 10px;
     padding-right: 15px;
diff --git a/htdocs/index.html b/htdocs/index.html
index b40173c..2419a4c 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -176,10 +176,12 @@
     <div class="hidden-element" id="upload_progress_window">
       <div class="box">
         <h1>Upload Progress</h1>
-        <table style="width: 100%;height: auto" id="ID_UploadProgressTable">
-        </table>
-        <button id="ID_RenterUploadsOk" type="button">OK</button>
+        <div class="fill" style="overflow: scroll">
+          <table class="fill-content" style="width: 100%;" id="ID_UploadProgressTable">
+          </table>
+        </div>
       </div>
+      <button id="ID_RenterUploadsOk" style="width: 110px" type="button">Back</button>
     </div>
   </body>
 </html>
\ No newline at end of file