diff --git a/rapids/templates/rapids/rapid_form.html b/rapids/templates/rapids/rapid_form.html
index 4aaad48b..6589e195 100755
--- a/rapids/templates/rapids/rapid_form.html
+++ b/rapids/templates/rapids/rapid_form.html
@@ -12,6 +12,8 @@
     // set to hold the files that are still being processed
     let active_file_inputs = new Set();
 
+    let loading_viewer = false;
+
     async function listAllFilesAndDirs(dirHandle, files_only) {
         const files = [];
         for await (let [name, handle] of dirHandle) {
@@ -538,6 +540,9 @@
                 console.log("active", active_file_inputs)
                 // Only load once all queued files have been processed
                 if (active_file_inputs.size < 1) {
+                    while (loading_viewer) {
+                        
+                    }
                     loadViewer();
                 }
             });
@@ -555,6 +560,7 @@
     }
 
     function loadViewer() {
+        loading_viewer = true;
         console.log("LOAD VIEWER")
         // temp fix before starting viewer collapsed
         $("#single-dicom-viewer").show()
@@ -576,13 +582,14 @@
             "detail": image_set
         });
 
-        if (active_file_inputs.size < 1) {
-            window.dispatchEvent(event);
-        }
+        window.dispatchEvent(event);
         sortable('.sortable');
         //sortable('.sortable')[0].addEventListener('sortstop', function(e) {
         updateImagePositions();
         //}
+        setTimeout(function () {
+            loading_viewer = false
+        }, 1000);
 
     }