diff --git a/leave/static/leave_assign/action.js b/leave/static/leave_assign/action.js
index 8ed735e82..63c077cbc 100644
--- a/leave/static/leave_assign/action.js
+++ b/leave/static/leave_assign/action.js
@@ -57,6 +57,7 @@ function getCurrentLanguageCode(callback) {
 function tickLeaveCheckboxes() {
   var ids = JSON.parse($("#selectedLeaves").attr("data-ids") || "[]");
   uniqueIds = makeLeaveListUnique(ids);
+  toggleHighlight(uniqueIds);
   click = $("#selectedLeaves").attr("data-clicked");
   if (click === "1") {
     $(".all-assigned-leaves").prop("checked", true);
@@ -186,6 +187,9 @@ $("#unselectAllLeaves").click(function (e) {
           $("#" + empId).prop("checked", false);
           $(".all-assigned-leaves").prop("checked", false);
         }
+        var ids = JSON.parse($("#selectedLeaves").attr("data-ids") || "[]");
+        uniqueIds = makeLeaveListUnique(ids);
+        toggleHighlight(uniqueIds);
         $("#selectedLeaves").attr("data-ids", JSON.stringify([]));
         count = [];
         tickLeaveCheckboxes(count);
diff --git a/leave/templates/leave/leave_assign/assigned_leave.html b/leave/templates/leave/leave_assign/assigned_leave.html
index f07f2a212..758267b9e 100644
--- a/leave/templates/leave/leave_assign/assigned_leave.html
+++ b/leave/templates/leave/leave_assign/assigned_leave.html
@@ -25,7 +25,7 @@
             <div class="oh-sticky-table__tr" draggable="true">
                 <div class="oh-sticky-table__sd">
                     <div class="centered-div">
-                        <input type="checkbox" id="{{available_leave.id}}" 
+                        <input type="checkbox" id="{{available_leave.id}}" onchange="highlightRow($(this))"
                         class="oh-input assigned-leaves-checkbox oh-input__checkbox all-assigned-leaves-row" />
                     </div>
                 </div>
@@ -112,9 +112,9 @@
     $(".all-assigned-leaves").change(function () {
       var is_checked = $(this).is(":checked");
       if (is_checked) {
-        $(".all-assigned-leaves-row").prop("checked", true);
+        $(".all-assigned-leaves-row").prop("checked", true).closest(".oh-sticky-table__tr").addClass("highlight-selected");
       } else {
-        $(".all-assigned-leaves-row").prop("checked", false);
+        $(".all-assigned-leaves-row").prop("checked", false).closest(".oh-sticky-table__tr").removeClass("highlight-selected");
       }
       addingAssignedLeaveIds();
     });