diff --git a/base/templates/work_type_request/htmx/group_by.html b/base/templates/work_type_request/htmx/group_by.html
index baf8f079b..7b0682b65 100644
--- a/base/templates/work_type_request/htmx/group_by.html
+++ b/base/templates/work_type_request/htmx/group_by.html
@@ -11,7 +11,7 @@
 	<div
 	class="oh-checkpoint-badge text-secondary mb-2"
 	id="unselectAllWorktypes"
-	style="cursor: pointer"
+	style="cursor: pointer;display: none;"
 	>
 	{% trans "Unselect All Worktypes" %}
 	</div>
@@ -338,8 +338,10 @@ style="cursor: pointer; display: none"
 		if (selectedCount === 0) {
 		  $("#selectedShowWorktypes").css("display", "none");
 		  $("#exportWorktypes").css("display", "none");
+		  $("#unselectAllWorktypes").css("display", "none");
 		} else {
 		  $("#exportWorktypes").css("display", "inline-flex");
+		  $("#unselectAllWorktypes").css("display", "inline-flex");
 		  $("#selectedShowWorktypes").css("display", "inline-flex");
 		  $("#selectedShowWorktypes").text(selectedCount + " - " + message);
 		}
@@ -348,6 +350,9 @@ style="cursor: pointer; display: none"
   
 	$(document).ready(function () {
 	  $(".all-work-type-requests-row").change(function () {
+		if ($('.all-work-type-requests').is(":checked")) {
+			$(".all-work-type-requests").prop("checked", false);
+		}
 		addingWorktypeIds();
 	  });
   
diff --git a/base/templates/work_type_request/htmx/requests.html b/base/templates/work_type_request/htmx/requests.html
index 3edebb118..a01ee53a4 100755
--- a/base/templates/work_type_request/htmx/requests.html
+++ b/base/templates/work_type_request/htmx/requests.html
@@ -13,18 +13,18 @@ style="cursor: pointer"
 <div
 class="oh-checkpoint-badge text-secondary mb-2"
 id="unselectAllWorktypes"
-style="cursor: pointer"
+style="cursor: pointer;display: none;"
 >
   {% trans "Unselect All Worktypes" %}
 </div>
 <div
 class="oh-checkpoint-badge text-info mb-2"
 id="exportWorktypes"
-style="cursor: pointer; display: none"
+style="cursor: pointer; display: none;"
 >
   {% trans "Export Worktypes" %}
 </div>
-<div class="oh-checkpoint-badge text-danger mb-2" id="selectedShowWorktypes" style="display: none"></div>
+<div class="oh-checkpoint-badge text-danger mb-2" id="selectedShowWorktypes" style="display: none;"></div>
 
 {% if data %}
   <div class="oh-table_sticky--wrapper">
@@ -291,8 +291,10 @@ style="cursor: pointer; display: none"
       if (selectedCount === 0) {
         $("#selectedShowWorktypes").css("display", "none");
         $("#exportWorktypes").css("display", "none");
+        $("#unselectAllWorktypes").css("display", "none");
       } else {
         $("#exportWorktypes").css("display", "inline-flex");
+        $("#unselectAllWorktypes").css("display", "inline-flex");
         $("#selectedShowWorktypes").css("display", "inline-flex");
         $("#selectedShowWorktypes").text(selectedCount + " - " + message);
       }
@@ -301,6 +303,9 @@ style="cursor: pointer; display: none"
 
   $(document).ready(function () {
     $(".all-work-type-requests-row").change(function () {
+      if ($('.all-work-type-requests').is(":checked")) {
+        $(".all-work-type-requests").prop("checked", false);
+      }
       addingWorktypeIds();
     });
 
diff --git a/base/templates/work_type_request/work_type_request_view.html b/base/templates/work_type_request/work_type_request_view.html
index c46ba71ae..5f4f43104 100644
--- a/base/templates/work_type_request/work_type_request_view.html
+++ b/base/templates/work_type_request/work_type_request_view.html
@@ -36,8 +36,11 @@
     </div>
     <!-- end of quick filters  -->
     <div id="view-container" >
-        {% if data %} {% include 'work_type_request/htmx/requests.html' %} {% else %}
-        {% include 'work_type_request/htmx/empty_request.html' %} {% endif %}
+        {% if data %} 
+            {% include 'work_type_request/htmx/requests.html' %} 
+        {% else %}
+            {% include 'work_type_request/htmx/empty_request.html' %} 
+        {% endif %}
     </div>
 </div>