diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js b/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js
index 1051c5a3ca..552541d570 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js
@@ -159,11 +159,10 @@
         });
         $("#ill-batch-modal").on("hidden.bs.modal", function () {
             // Reset our state when we close the modal
-            // TODO: need to also reset progress bar and already processed identifiers
             delete elId.dataset.batchId;
             delete elId.dataset.backend;
             batchId = null;
-            tableEl.style.display = "none";
+            $("#identifier-table_wrapper").hide();
             tableContent.data = [];
             progressTotals.data = {
                 total: 0,
@@ -173,6 +172,8 @@
             textarea.value = "";
             batch.data = {};
             cancelButton.innerHTML = cancelButtonOriginalText;
+            hideProgress();
+            hideErrors();
             // Remove event listeners we created
             removeEventListeners();
         });
@@ -192,11 +193,13 @@
             isUpdate = true;
             setModalHeading();
             finishButton.removeAttribute("disabled");
-            createButton.style.display = "none";
+            hideCreateButton();
         } else {
             batch.data = emptyBatch;
             setModalHeading();
             finishButton.style.display = "none";
+            createButton.style.display = "inline-block";
+            createButton.setAttribute("disabled", 1);
         }
         fetchStatuses();
         finishButtonEventListener();
@@ -399,7 +402,7 @@
         createButton.removeEventListener("click", createBatch);
         identifierTable.removeEventListener("click", toggleMetadata);
         identifierTable.removeEventListener("click", removeRow);
-        createRequestsButton.remove("click", requestRequestable);
+        createRequestsButton.removeEventListener("click", requestRequestable);
     }
 
     function finishButtonEventListener() {
@@ -637,6 +640,11 @@
         el.style.display = "block";
     }
 
+    function hideProgress() {
+        var el = document.getElementById("create-progress");
+        el.style.display = "none";
+    }
+
     function showCreateRequestsButton() {
         var data = progressTotals.data;
         var el = document.getElementById("create-requests");
@@ -729,6 +737,8 @@
         // Now build and display the table
         if (!table) {
             buildTable();
+        } else {
+            tableEl.parentElement.style.display = "block";
         }
 
         // We may be appending new values to an existing table,
@@ -783,7 +793,7 @@
     }
 
     function hideCreateButton() {
-        createButton.remove();
+        createButton.style.display = "none";
     }
 
     async function populateMetadata(identifier) {