diff --git a/apps/home/static/home/js/tables.js b/apps/home/static/home/js/tables.js
index 0560508..fa4aa38 100644
--- a/apps/home/static/home/js/tables.js
+++ b/apps/home/static/home/js/tables.js
@@ -268,9 +268,10 @@ function bindTableSearch(tableId) {
 // region Button Controls
 
 function bindRefreshButton(tableId) {
-    const $tableFilters = $(tableId).closest('.js-tableBody').siblings('.js-tableFilters');
-    $tableFilters.on("click", ".table-refresh-btn", function() {
-        $tableFilters.find(".table-del-btn").prop("disabled", true);
+    $controls = getTableFiltersComponent(tableId);
+    $controls.on("click", ".js-tableRefreshBtn", function() {
+        $controls.find(".js-tableDeleteBtn").prop("disabled", true);
+        $controls.find(".js-tableShareBtn").prop("disabled", true);
         $(tableId).trigger("doDataLoad");
     })
 }
@@ -313,7 +314,10 @@ function determineSelectAllState(tableId) {
     $checkbox.prop("checked", doCheck);
     $checkbox.prop("indeterminate", doIndeterminate);
 
-    $(tableId).closest(".js-tableBody").siblings(".js-tableFilters").find(".table-del-btn").prop("disabled", !doCheck && !doIndeterminate);
+    const selectionExists = doCheck || doIndeterminate;
+    const $controls = getTableFiltersComponent(tableId);
+    $controls.find(".js-tableShareBtn").prop("disabled", !selectionExists);
+    $controls.find(".js-tableDeleteBtn").prop("disabled", !selectionExists);
 }