diff --git a/assets/templates/uploads.html b/assets/templates/uploads.html
index 6b950d0..08c7a06 100644
--- a/assets/templates/uploads.html
+++ b/assets/templates/uploads.html
@@ -280,8 +280,8 @@
               </main>
             </div>
             <div class="modal-footer">
-              <button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button>
-              <button type="button" class="btn btn-link waves-effect" data-toggle="modal" data-dismiss="modal" data-target="#defaultModal2">NEXT</button>
+              <button type="button" class="btn btn-link waves-effect" id="defaultModal-close">CLOSE</button>
+              <button type="button" class="btn btn-link waves-effect" id="defaultModal-next">NEXT</button>
             </div>
           </div>
         </div>
@@ -324,8 +324,8 @@
               </div>
             </div>
             <div class="modal-footer">
-              <button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button>
-              <button type="button" class="btn btn-link waves-effect" data-toggle="modal" data-dismiss="modal" data-target="#defaultModal3" id="confirm-files-button">NEXT</button>
+              <button type="button" class="btn btn-link waves-effect" id="defaultModal2-close">CLOSE</button>
+              <button type="button" class="btn btn-link waves-effect" id="confirm-files-button">NEXT</button>
             </div>
           </div>
         </div>
@@ -390,8 +390,8 @@
                 </table>
 
                 <div class="modal-footer">
-                  <button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button>
-                  <button type="button" class="btn btn-link waves-effect" data-dismiss="modal" id="upload-confirm-button" data-target="#preparingUploadModal">CONFIRM</button>
+                  <button type="button" class="btn btn-link waves-effect" id="defaultModal3-close">CLOSE</button>
+                  <button type="button" class="btn btn-link waves-effect" id="upload-confirm-button">CONFIRM</button>
                 </div>
               </main>
             </div>
diff --git a/renderer/uploads.js b/renderer/uploads.js
index e754eea..f969132 100644
--- a/renderer/uploads.js
+++ b/renderer/uploads.js
@@ -899,8 +899,6 @@ class Uploads {
 
   startUploadProcess() {
     console.log("Starting Upload Process..");
-    $("#preparingUploadModal").iziModal();
-    $('#preparingUploadModal').iziModal('open');
     var streamFinishCount = 0;
     for (var i = 0; i < MainFileArray.length; i++) {
       const streamFiles = (files) => {
@@ -1436,15 +1434,40 @@ $(document).on("render_uploads", function () {
     EthoUploads.resetUploadProcess();
   });
 
+  $(document).on("click", "#defaultModal-close", function (event) {
+    $('#defaultModal').iziModal('close');
+  });
+
+  $(document).on("click", "#defaultModal-next", function (event) {
+    $('#defaultModal2').iziModal();
+    $('#defaultModal2').iziModal('open');
+    $('#defaultModal').iziModal('close');
+    EthoUploads.resetUploadProcess();
+  });         
+
+  $(document).on("click", "#defaultModal2-close", function (event) {
+    $('#defaultModal2').iziModal('close');
+  });
+
   $(document).on("click", "#ethofs-registration-button", function (event) {
     EthoUploads.AddNewUser(document.getElementById('username').value);
   });
 
   $(document).on("click", "#confirm-files-button", function (event) {
+    $('#defaultModal3').iziModal();
+    $('#defaultModal3').iziModal('open');
+    $('#defaultModal2').iziModal('close');
     EthoUploads.resetUploadModal();
   });
 
+  $(document).on("click", "#defaultModal3-close", function (event) {
+    $('#defaultModal3').iziModal('close');
+  });
+
   $(document).on("click", "#upload-confirm-button", function (event) {
+    $('#preparingUploadModal').iziModal();
+    $('#preparingUploadModal').iziModal('open');
+    $('#defaultModal3').iziModal('close');
     EthoUploads.startUploadProcess();
   });