diff --git a/package/share/ahriman/templates/build-status/key-import-modal.jinja2 b/package/share/ahriman/templates/build-status/key-import-modal.jinja2
index fb5b4f0f..9767abb3 100644
--- a/package/share/ahriman/templates/build-status/key-import-modal.jinja2
+++ b/package/share/ahriman/templates/build-status/key-import-modal.jinja2
@@ -38,10 +38,6 @@
 <script>
     const keyImportModal = $("#key-import-modal");
     const keyImportForm = $("#key-import-form");
-    keyImportModal.on("hidden.bs.modal", () => {
-        keyImportBodyInput.text("");
-        keyImportForm.trigger("reset");
-    });
 
     const keyImportBodyInput = $("#key-import-body-input");
     const keyImportCopyButton = $("#key-import-copy-button");
@@ -90,4 +86,11 @@
             });
         }
     }
+
+    $(() => {
+        keyImportModal.on("hidden.bs.modal", () => {
+            keyImportBodyInput.text("");
+            keyImportForm.trigger("reset");
+        });
+    });
 </script>
diff --git a/package/share/ahriman/templates/build-status/login-modal.jinja2 b/package/share/ahriman/templates/build-status/login-modal.jinja2
index 53b9068a..834ba738 100644
--- a/package/share/ahriman/templates/build-status/login-modal.jinja2
+++ b/package/share/ahriman/templates/build-status/login-modal.jinja2
@@ -36,9 +36,6 @@
 <script>
     const loginModal = $("#login-modal");
     const loginForm = $("#login-form");
-    loginModal.on("hidden.bs.modal", () => {
-        loginForm.trigger("reset");
-    });
 
     const loginPasswordInput = $("#login-password");
     const loginUsernameInput = $("#login-username");
@@ -77,4 +74,10 @@
             showHidePasswordButton.addClass("bi-eye");
         }
     }
+
+    $(() => {
+        loginModal.on("hidden.bs.modal", () => {
+            loginForm.trigger("reset");
+        });
+    });
 </script>
diff --git a/package/share/ahriman/templates/build-status/package-add-modal.jinja2 b/package/share/ahriman/templates/build-status/package-add-modal.jinja2
index 5b9766f7..171e6cab 100644
--- a/package/share/ahriman/templates/build-status/package-add-modal.jinja2
+++ b/package/share/ahriman/templates/build-status/package-add-modal.jinja2
@@ -43,41 +43,10 @@
 <script>
     const packageAddModal = $("#package-add-modal");
     const packageAddForm = $("#package-add-form");
-    packageAddModal.on("shown.bs.modal", () => {
-        $(`#package-add-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
-    });
-    packageAddModal.on("hidden.bs.modal", () => {
-        packageAddVariablesDiv.empty();
-        packageAddForm.trigger("reset");
-    });
 
     const packageAddInput = $("#package-add-input");
     const packageAddRepositoryInput = $("#package-add-repository-input");
     const packageAddKnownPackagesList = $("#package-add-known-packages-dlist");
-    packageAddInput.keyup(() => {
-        clearTimeout(packageAddInput.data("timeout"));
-        packageAddInput.data("timeout", setTimeout($.proxy(() => {
-            const value = packageAddInput.val();
-
-            if (value.length >= 3) {
-                $.ajax({
-                    url: "/api/v1/service/search",
-                    data: {"for": value},
-                    type: "GET",
-                    dataType: "json",
-                    success: response => {
-                        const options = response.map(pkg => {
-                            const option = document.createElement("option");
-                            option.value = pkg.package;
-                            option.innerText = `${pkg.package} (${pkg.description})`;
-                            return option;
-                        });
-                        packageAddKnownPackagesList.empty().append(options);
-                    },
-                });
-            }
-        }, this), 500));
-    });
 
     const packageAddVariablesDiv = $("#package-add-variables-div");
 
@@ -156,4 +125,39 @@
             doPackageAction("/api/v1/service/request", [packages], repository, onSuccess, onFailure, patches);
         }
     }
+
+    $(() => {
+        packageAddModal.on("shown.bs.modal", () => {
+            $(`#package-add-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
+        });
+        packageAddModal.on("hidden.bs.modal", () => {
+            packageAddVariablesDiv.empty();
+            packageAddForm.trigger("reset");
+        });
+
+        packageAddInput.keyup(() => {
+            clearTimeout(packageAddInput.data("timeout"));
+            packageAddInput.data("timeout", setTimeout($.proxy(() => {
+                const value = packageAddInput.val();
+
+                if (value.length >= 3) {
+                    $.ajax({
+                        url: "/api/v1/service/search",
+                        data: {"for": value},
+                        type: "GET",
+                        dataType: "json",
+                        success: response => {
+                            const options = response.map(pkg => {
+                                const option = document.createElement("option");
+                                option.value = pkg.package;
+                                option.innerText = `${pkg.package} (${pkg.description})`;
+                                return option;
+                            });
+                            packageAddKnownPackagesList.empty().append(options);
+                        },
+                    });
+                }
+            }, this), 500));
+        });
+    });
 </script>
diff --git a/package/share/ahriman/templates/build-status/package-info-modal.jinja2 b/package/share/ahriman/templates/build-status/package-info-modal.jinja2
index 912755f4..f1575e29 100644
--- a/package/share/ahriman/templates/build-status/package-info-modal.jinja2
+++ b/package/share/ahriman/templates/build-status/package-info-modal.jinja2
@@ -72,26 +72,6 @@
     const packageInfoModal = $("#package-info-modal");
     const packageInfoModalHeader = $("#package-info-modal-header");
     const packageInfo = $("#package-info");
-    packageInfoModal.on("hidden.bs.modal", () => {
-        packageInfoAurUrl.empty();
-        packageInfoDepends.empty();
-        packageInfoGroups.empty();
-        packageInfoLicenses.empty();
-        packageInfoPackager.empty();
-        packageInfoPackages.empty();
-        packageInfoUpstreamUrl.empty();
-        packageInfoVersion.empty();
-
-        packageInfoVariablesBlock.attr("hidden", true);
-        packageInfoVariablesDiv.empty();
-
-        packageInfoLogsInput.empty();
-        packageInfoChangesInput.empty();
-
-        packageInfoModal.trigger("reset");
-
-        hideInfoControls(true);
-    });
 
     const packageInfoLogsInput = $("#package-info-logs-input");
     const packageInfoLogsCopyButton = $("#package-info-logs-copy-button");
@@ -309,4 +289,27 @@
 
         if (isPackageBaseSet) packageInfoModal.modal("show");
     }
+
+    $(() => {
+        packageInfoModal.on("hidden.bs.modal", () => {
+            packageInfoAurUrl.empty();
+            packageInfoDepends.empty();
+            packageInfoGroups.empty();
+            packageInfoLicenses.empty();
+            packageInfoPackager.empty();
+            packageInfoPackages.empty();
+            packageInfoUpstreamUrl.empty();
+            packageInfoVersion.empty();
+
+            packageInfoVariablesBlock.attr("hidden", true);
+            packageInfoVariablesDiv.empty();
+
+            packageInfoLogsInput.empty();
+            packageInfoChangesInput.empty();
+
+            packageInfoModal.trigger("reset");
+
+            hideInfoControls(true);
+        });
+    });
 </script>
diff --git a/package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2 b/package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2
index d444a620..02b31f3a 100644
--- a/package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2
+++ b/package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2
@@ -35,11 +35,6 @@
 <script>
     const packageRebuildModal = $("#package-rebuild-modal");
     const packageRebuildForm = $("#package-rebuild-form");
-    packageRebuildModal.on("shown.bs.modal", () => {
-        $(`#package-rebuild-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
-
-    });
-    packageRebuildModal.on("hidden.bs.modal", () => { packageRebuildForm.trigger("reset"); });
 
     const packageRebuildDependencyInput = $("#package-rebuild-dependency-input");
     const packageRebuildRepositoryInput = $("#package-rebuild-repository-input");
@@ -54,4 +49,12 @@
             doPackageAction("/api/v1/service/rebuild", [packages], repository, onSuccess, onFailure);
         }
     }
+
+    $(() => {
+        packageRebuildModal.on("shown.bs.modal", () => {
+            $(`#package-rebuild-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
+
+        });
+        packageRebuildModal.on("hidden.bs.modal", () => { packageRebuildForm.trigger("reset"); });
+    });
 </script>
diff --git a/package/share/ahriman/templates/build-status/table.jinja2 b/package/share/ahriman/templates/build-status/table.jinja2
index 2d9e52c9..68cfcb2b 100644
--- a/package/share/ahriman/templates/build-status/table.jinja2
+++ b/package/share/ahriman/templates/build-status/table.jinja2
@@ -9,46 +9,8 @@
     const packageInfoUpdateButton = $("#package-info-update-button");
 
     let repository = null;
-    $("#repositories a").on("click", (event) => {
-        const element = event.target;
-        repository = {
-            architecture: element.dataset.architecture,
-            repository: element.dataset.repository,
-        };
-        packageUpdateButton.html(`<i class="bi bi-play"></i> update<span class="d-none d-sm-inline"> ${safe(repository.repository)} (${safe(repository.architecture)})</span>`);
-        $(`#${element.id}`).tab("show");
-        reload();
-    });
 
     const table = $("#packages");
-    table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table", () => {
-        packageRemoveButton.prop("disabled", !table.bootstrapTable("getSelections").length);
-    });
-    table.on("click-row.bs.table", (self, data, row, cell) => {
-        if (0 === cell || "base" === cell) {
-            const method = data[0] === true ? "uncheckBy" : "checkBy"; // fck javascript
-            table.bootstrapTable(method, {field: "id", values: [data.id]});
-        } else showPackageInfo(data.id);
-    });
-    table.on("created-controls.bs.table", () => {
-        const pickerInput = $(".bootstrap-table-filter-control-timestamp");
-        pickerInput.daterangepicker({
-            autoUpdateInput: false,
-            locale: {
-                cancelLabel: "Clear",
-            },
-        });
-
-        pickerInput.on("apply.daterangepicker", (event, picker) => {
-            pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
-            table.bootstrapTable("triggerSearch");
-        });
-
-        pickerInput.on("cancel.daterangepicker", () => {
-            pickerInput.val("");
-            table.bootstrapTable("triggerSearch");
-        });
-    });
 
     const statusBadge = $("#badge-status");
     const versionBadge = $("#badge-version");
@@ -221,6 +183,46 @@
     }
 
     $(() => {
+        $("#repositories a").on("click", event => {
+            const element = event.target;
+            repository = {
+                architecture: element.dataset.architecture,
+                repository: element.dataset.repository,
+            };
+            packageUpdateButton.html(`<i class="bi bi-play"></i> update<span class="d-none d-sm-inline"> ${safe(repository.repository)} (${safe(repository.architecture)})</span>`);
+            $(`#${element.id}`).tab("show");
+            reload();
+        });
+
+        table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table", () => {
+            packageRemoveButton.prop("disabled", !table.bootstrapTable("getSelections").length);
+        });
+        table.on("click-row.bs.table", (self, data, row, cell) => {
+            if (0 === cell || "base" === cell) {
+                const method = data[0] === true ? "uncheckBy" : "checkBy"; // fck javascript
+                table.bootstrapTable(method, {field: "id", values: [data.id]});
+            } else showPackageInfo(data.id);
+        });
+        table.on("created-controls.bs.table", () => {
+            const pickerInput = $(".bootstrap-table-filter-control-timestamp");
+            pickerInput.daterangepicker({
+                autoUpdateInput: false,
+                locale: {
+                    cancelLabel: "Clear",
+                },
+            });
+
+            pickerInput.on("apply.daterangepicker", (event, picker) => {
+                pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
+                table.bootstrapTable("triggerSearch");
+            });
+
+            pickerInput.on("cancel.daterangepicker", () => {
+                pickerInput.val("");
+                table.bootstrapTable("triggerSearch");
+            });
+        });
+
         table.bootstrapTable({});
         statusBadge.popover();
         selectRepository();
diff --git a/package/share/ahriman/templates/repo-index.jinja2 b/package/share/ahriman/templates/repo-index.jinja2
index 6601d856..266e0801 100644
--- a/package/share/ahriman/templates/repo-index.jinja2
+++ b/package/share/ahriman/templates/repo-index.jinja2
@@ -102,25 +102,6 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
 
         <script>
             const table = $("#packages");
-            table.on("created-controls.bs.table", () => {
-                const pickerInput = $(".bootstrap-table-filter-control-timestamp");
-                pickerInput.daterangepicker({
-                    autoUpdateInput: false,
-                    locale: {
-                        cancelLabel: "Clear",
-                    },
-                });
-
-                pickerInput.on("apply.daterangepicker", (event, picker) => {
-                    pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
-                    table.bootstrapTable("triggerSearch");
-                });
-
-                pickerInput.on("cancel.daterangepicker", () => {
-                    pickerInput.val("");
-                    table.bootstrapTable("triggerSearch");
-                });
-            });
 
             const pacmanConf = $("#pacman-conf");
             const pacmanConfCopyButton = $("#copy-btn");
@@ -141,6 +122,28 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
             function filterListLicenses() {
                 return extractDataList(table.bootstrapTable("getData"), "licenses");
             }
+
+            $(() => {
+                table.on("created-controls.bs.table", () => {
+                    const pickerInput = $(".bootstrap-table-filter-control-timestamp");
+                    pickerInput.daterangepicker({
+                        autoUpdateInput: false,
+                        locale: {
+                            cancelLabel: "Clear",
+                        },
+                    });
+
+                    pickerInput.on("apply.daterangepicker", (event, picker) => {
+                        pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
+                        table.bootstrapTable("triggerSearch");
+                    });
+
+                    pickerInput.on("cancel.daterangepicker", () => {
+                        pickerInput.val("");
+                        table.bootstrapTable("triggerSearch");
+                    });
+                });
+            });
         </script>
 
     </body>