diff --git a/src/app/features/conditions/edit-conditions/conditions.component.html b/src/app/features/conditions/edit-conditions/conditions.component.html
index 6432d4a7ba..e7e38f0dcb 100644
--- a/src/app/features/conditions/edit-conditions/conditions.component.html
+++ b/src/app/features/conditions/edit-conditions/conditions.component.html
@@ -104,12 +104,14 @@
               [tooltip]="CONDITION_VALUE_2_TOOLTIPS[conditionType]"
             ></i>
             <keira-flags-selector-btn
+              id="queststate-flag-selector"
               *ngIf="showQuestState"
               [control]="editorService.form.controls.ConditionValue2"
               [config]="{ flags: QUEST_STATE, name: 'ConditionValue2' }"
               [modalClass]="'modal-lg'"
             ></keira-flags-selector-btn>
 			      <keira-flags-selector-btn
+              id="rankmask-flag-selector"
 			        *ngIf="showReactionTo"
               [control]="editorService.form.controls.ConditionValue2"
               [config]="{ flags: RANKMASK, name: 'ConditionValue2' }"
diff --git a/src/app/features/conditions/edit-conditions/conditions.component.ts b/src/app/features/conditions/edit-conditions/conditions.component.ts
index 2c67c66ae2..3219c37738 100644
--- a/src/app/features/conditions/edit-conditions/conditions.component.ts
+++ b/src/app/features/conditions/edit-conditions/conditions.component.ts
@@ -53,7 +53,6 @@ export class ConditionsComponent extends SingleRowEditorComponent<Conditions> {
   }
 
   get showReactionTo(): boolean {
-    /* istanbul ignore next */ // TODO
     switch (this.conditionType) {
       case CONDITION_TYPES.CONDITION_REPUTATION_RANK:
       case CONDITION_TYPES.CONDITION_REACTION_TO:
diff --git a/src/app/features/conditions/edit-conditions/conditions.integration.spec.ts b/src/app/features/conditions/edit-conditions/conditions.integration.spec.ts
index 5a48d32ebc..4e3b61dcd3 100644
--- a/src/app/features/conditions/edit-conditions/conditions.integration.spec.ts
+++ b/src/app/features/conditions/edit-conditions/conditions.integration.spec.ts
@@ -11,7 +11,10 @@ import { EditorPageObject } from '@keira-testing/editor-page-object';
 import { Conditions } from '@keira-types/conditions.type';
 import { ConditionsHandlerService } from '../conditions-handler.service';
 
-class ConditionsPage extends EditorPageObject<ConditionsComponent> {}
+class ConditionsPage extends EditorPageObject<ConditionsComponent> {
+  getQuestStateFlagSelector(assert = true) { return this.query(`#queststate-flag-selector`, assert); }
+  getRankMaskFlagSelector(assert = true) { return this.query(`#rankmask-flag-selector`, assert); }
+}
 
 describe('Conditions integration tests', () => {
   let component: ConditionsComponent;
@@ -115,6 +118,18 @@ describe('Conditions integration tests', () => {
       expect(querySpy.calls.mostRecent().args[0]).toContain(expectedQuery);
     });
 
+    it('should correctly toggle flag selector according to the selected condition type', () => {
+      expect(page.getQuestStateFlagSelector(false)).toBeFalsy();
+      expect(page.getRankMaskFlagSelector(false)).toBeFalsy();
+
+      page.setSelectValueById('ConditionTypeOrReference', 5); // CONDITION_REPUTATION_RANK
+      expect(page.getQuestStateFlagSelector(false)).toBeFalsy();
+      expect(page.getRankMaskFlagSelector).toBeTruthy();
+
+      page.setSelectValueById('ConditionTypeOrReference', 47); // CONDITION_QUESTSTATE
+      expect(page.getQuestStateFlagSelector).toBeTruthy();
+      expect(page.getRankMaskFlagSelector(false)).toBeFalsy();
+    });
   });