diff --git a/payroll/templates/payroll/payslip/filter_payslips.html b/payroll/templates/payroll/payslip/filter_payslips.html
index 135aaf1e6..dfe0c12f9 100644
--- a/payroll/templates/payroll/payslip/filter_payslips.html
+++ b/payroll/templates/payroll/payslip/filter_payslips.html
@@ -7,6 +7,7 @@
   hx-swap="innerHTML"
   hx-target="#payroll-payslip-container"
 >
+  <input type="hidden" name="group_by" value="{{request.GET.group_by}}" data-exclude-saved-filter="true">
   <div class="oh-dropdown__filter-body">
     <div class="oh-accordion">
       <div class="oh-accordion-header">{% trans "Payslip" %}</div>
diff --git a/payroll/templates/payroll/payslip/group_payslips.html b/payroll/templates/payroll/payslip/group_payslips.html
index 64ab1a5bb..1339f43b6 100644
--- a/payroll/templates/payroll/payslip/group_payslips.html
+++ b/payroll/templates/payroll/payslip/group_payslips.html
@@ -33,11 +33,11 @@
               {{payslip.list|length}}
               </span>
           </div>
-          <span>
-            <input type="text" class="oh-tabs__movable-title oh-table__editable-input oh-table__editable-input--batch" value="{{payslip.grouper}}" name="" id="{{payslip.grouper}}Grouper" data-previous-name="{{payslip.grouper}}">
+          <span onclick="event.stopPropagation()">
+            <input type="text" class="oh-tabs__movable-title  oh-table__editable-input--batch" value="{{payslip.grouper}}" name="" id="{{payslip.grouper}}Grouper" data-previous-name="{{payslip.grouper}}">
           </span>
         </span>
-        <div class="oh-accordion-meta__actions">
+        <div class="oh-accordion-meta__actions" onclick="event.stopPropagation()">
           <select name="update_selected" onclick="event.stopPropagation()" class="oh-select" data-accordion-id="{{payslip.grouper}}Container">
             <option value="">------</option>
             <option value="draft">Draft</option>