diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 7e3171e7c..d5d0192a2 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -92,9 +92,10 @@ class SoongWorkflowCommentWizard(models.TransientModel):
         all_employees = self.env['hr.employee'].search(domain)
         self.employee_ids = all_employees if self.is_selection else False
 
-    @api.onchange('scope_type', 'employee_ids1', 'department_id', 'company_id')
+    @api.onchange('scope_type',  'department_id', 'company_id', 'employee_ids1')
     def _onchange_employee_ids1(self):
-        self.employee_ids = False
+        if self.is_selection:
+            return
         if not self.employee_ids1:
             self.employee_ids = False
             return
@@ -114,7 +115,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
 
         if len(filtered_employees) == 1:
             self.employee_ids = filtered_employees
-            return
 
     @api.onchange('scope_type', 'department_id', 'company_id')
     def _onchange_employee_ids2(self):