diff --git a/base/static/base/actions.js b/base/static/base/actions.js
index 1377fdcfd..d946b2c5b 100644
--- a/base/static/base/actions.js
+++ b/base/static/base/actions.js
@@ -116,15 +116,16 @@ function getCurrentLanguageCode(callback) {
 $(".all-rshift").change(function (e) {
   var is_checked = $(this).is(":checked");
   if (is_checked) {
-    $(".all-rshift-row").prop("checked", true);
+    $(".all-rshift-row").prop("checked", true).closest(".oh-sticky-table__tr").addClass("highlight-selected");
   } else {
-    $(".all-rshift-row").prop("checked", false);
+    $(".all-rshift-row").prop("checked", false).closest(".oh-sticky-table__tr").removeClass("highlight-selected");
   }
 });
 
 function tickRShiftCheckboxes() {
   var ids = JSON.parse($("#selectedRShifts").attr("data-ids") || "[]");
   uniqueIds = makeRShiftListUnique(ids);
+  toggleHighlight(uniqueIds);
   click = $("#selectedRShifts").attr("data-clicked");
   if (click === "1") {
     $(".all-rshift").prop("checked", true);
@@ -303,15 +304,16 @@ $("#deleteRotatingShiftAssign").click(function (e) {
 $(".all-rwork-type").change(function (e) {
   var is_checked = $(this).is(":checked");
   if (is_checked) {
-    $(".all-rwork-type-row").prop("checked", true);
+    $(".all-rwork-type-row").prop("checked", true).closest(".oh-sticky-table__tr").addClass("highlight-selected");
   } else {
-    $(".all-rwork-type-row").prop("checked", false);
+    $(".all-rwork-type-row").prop("checked", false).closest(".oh-sticky-table__tr").removeClass("highlight-selected");
   }
 });
 
 function tickRWorktypeCheckboxes() {
   var ids = JSON.parse($("#selectedRWorktypes").attr("data-ids") || "[]");
   uniqueIds = makeWorktypeListUnique(ids);
+  toggleHighlight(uniqueIds);
   click = $("#selectedRWorktypes").attr("data-clicked");
   if (click === "1") {
     $(".all-rwork-type").prop("checked", true);
@@ -488,15 +490,16 @@ $("#deleteRotatingWorkTypeAssign").click(function (e) {
 $(".all-shift-requests").change(function (e) {
   var is_checked = $(this).is(":checked");
   if (is_checked) {
-    $(".all-shift-requests-row").prop("checked", true);
+    $(".all-shift-requests-row").prop("checked", true).closest(".oh-sticky-table__tr").addClass("highlight-selected");
   } else {
-    $(".all-shift-requests-row").prop("checked", false);
+    $(".all-shift-requests-row").prop("checked", false).closest(".oh-sticky-table__tr").removeClass("highlight-selected");
   }
 });
 
 function tickShiftCheckboxes() {
   var ids = JSON.parse($("#selectedShifts").attr("data-ids") || "[]");
   uniqueIds = makeShiftListUnique(ids);
+  toggleHighlight(uniqueIds);
   click = $("#selectedShifts").attr("data-clicked");
   if (click === "1") {
     $(".all-shift-requests").prop("checked", true);
@@ -722,15 +725,16 @@ $("#deleteShiftRequest").click(function (e) {
 $(".all-work-type-requests").change(function (e) {
   var is_checked = $(this).is(":checked");
   if (is_checked) {
-    $(".all-work-type-requests-row").prop("checked", true);
+    $(".all-work-type-requests-row").prop("checked", true).closest(".oh-sticky-table__tr").addClass("highlight-selected");
   } else {
-    $(".all-work-type-requests-row").prop("checked", false);
+    $(".all-work-type-requests-row").prop("checked", false).closest(".oh-sticky-table__tr").removeClass("highlight-selected");
   }
 });
 
 function tickWorktypeCheckboxes() {
   var ids = JSON.parse($("#selectedWorktypes").attr("data-ids") || "[]");
   uniqueIds = makeWorktypeListUnique(ids);
+  toggleHighlight(uniqueIds);
   click = $("#selectedWorktypes").attr("data-clicked");
   if (click === "1") {
     $(".all-work-type-requests").prop("checked", true);
diff --git a/base/templates/base/rotating_shift/rotating_shift_assign_view.html b/base/templates/base/rotating_shift/rotating_shift_assign_view.html
index 7de5bf68e..e407b44e1 100644
--- a/base/templates/base/rotating_shift/rotating_shift_assign_view.html
+++ b/base/templates/base/rotating_shift/rotating_shift_assign_view.html
@@ -61,6 +61,7 @@
                 <input
                   type="checkbox"
                   id="{{rshift.id}}"
+                  onchange="highlightRow($(this))"
                   class="oh-input rshift-checkbox oh-input__checkbox all-rshift-row"
                 />
               </div>
@@ -335,6 +336,9 @@
             $('#' + empId).prop('checked', false);
             $(".all-rshift").prop('checked', false);
 					}
+          var ids = JSON.parse($("#selectedRShifts").attr("data-ids") || "[]");
+          var uniqueIds = makeListUnique(ids);
+          toggleHighlight(uniqueIds);
 					$("#selectedRShifts").attr("data-ids", JSON.stringify([]));
 
 					count = [];
diff --git a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html
index 4ef254570..e151aaf58 100644
--- a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html
+++ b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html
@@ -59,6 +59,7 @@ style="cursor: pointer; display: none"
             <input
                 type="checkbox"
                 id="{{rwork_type.id}}"
+                onchange="highlightRow($(this))"
                 class="oh-input rwork-type-checkbox oh-input__checkbox all-rwork-type-row"
               />
           </div>
@@ -335,6 +336,9 @@ style="cursor: pointer; display: none"
             $('#' + empId).prop('checked', false);
             $(".all-rwork-type").prop('checked', false);
 					}
+          var ids = JSON.parse($("#selectedRWorktypes").attr("data-ids") || "[]");
+          var uniqueIds = makeListUnique(ids);
+          toggleHighlight(uniqueIds);
 					$("#selectedRWorktypes").attr("data-ids", JSON.stringify([]));
 
 					count = [];
diff --git a/base/templates/shift_request/htmx/requests.html b/base/templates/shift_request/htmx/requests.html
index d6b747b18..ec0e66396 100755
--- a/base/templates/shift_request/htmx/requests.html
+++ b/base/templates/shift_request/htmx/requests.html
@@ -68,6 +68,7 @@ style="cursor: pointer;"
                   <input
                     type="checkbox"
                     id="{{shift_request.id}}"
+                    onchange="highlightRow($(this))"
                     class="oh-input employee-checkbox oh-input__checkbox all-shift-requests-row"
                   />
                 </div>
@@ -284,6 +285,9 @@ style="cursor: pointer;"
             $("#" + empId).prop("checked", false);
             $(".all-shift-requests").prop("checked", false);
           }
+          var ids = JSON.parse($("#selectedShifts").attr("data-ids") || "[]");
+          var uniqueIds = makeListUnique(ids);
+          toggleHighlight(uniqueIds);
           $("#selectedShifts").attr("data-ids", JSON.stringify([]));
 
           count = [];
diff --git a/base/templates/work_type_request/htmx/requests.html b/base/templates/work_type_request/htmx/requests.html
index f4e28bf38..d6570ec5f 100755
--- a/base/templates/work_type_request/htmx/requests.html
+++ b/base/templates/work_type_request/htmx/requests.html
@@ -68,6 +68,7 @@ style="cursor: pointer; display: none"
               <input
                 type="checkbox"
                 id="{{work_type_request.id}}"
+                onchange="highlightRow($(this))"
                 class="oh-input employee-checkbox oh-input__checkbox all-work-type-requests-row"
               />
             </div>
@@ -290,6 +291,9 @@ style="cursor: pointer; display: none"
             $("#" + empId).prop("checked", false);
             $(".all-work-type-requests").prop("checked", false);
           }
+          var ids = JSON.parse($("#selectedWorktypes").attr("data-ids") || "[]");
+          var uniqueIds = makeListUnique(ids);
+          toggleHighlight(uniqueIds);
           $("#selectedWorktypes").attr("data-ids", JSON.stringify([]));
 
           count = [];