diff --git a/cypress/e2e/patient_spec/patient_logupdate.cy.ts b/cypress/e2e/patient_spec/patient_logupdate.cy.ts
index 8175d5df55c..70aa0474650 100644
--- a/cypress/e2e/patient_spec/patient_logupdate.cy.ts
+++ b/cypress/e2e/patient_spec/patient_logupdate.cy.ts
@@ -49,7 +49,6 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typeOtherDetails(otherExamination);
     patientLogupdate.selectSymptomsDate("01012024");
     patientLogupdate.typeAndMultiSelectSymptoms("fe", ["Fever"]);
-    patientLogupdate.clickAddSymptom();
     patientLogupdate.selectPatientCategory(patientCategory);
     patientLogupdate.typeSystolic(patientSystolic);
     patientLogupdate.typeDiastolic(patientDiastolic);
@@ -76,7 +75,6 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typeOtherDetails(otherExamination);
     patientLogupdate.selectSymptomsDate("01012024");
     patientLogupdate.typeAndMultiSelectSymptoms("fe", ["Fever"]);
-    patientLogupdate.clickAddSymptom();
     patientLogupdate.selectPatientCategory(patientCategory);
     patientLogupdate.typeSystolic(patientSystolic);
     patientLogupdate.typeDiastolic(patientDiastolic);
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 45a3cde3245..164e4586234 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -138,7 +138,7 @@ Cypress.Commands.add(
         optionArray.forEach((options) => {
           cy.get("[role='option']").contains(options).click();
         });
-        cy.get(selector).click();
+        cy.get(selector).get("#dropdown-toggle").click({ force: true });
       });
   },
 );
@@ -153,7 +153,7 @@ Cypress.Commands.add(
         optionArray.forEach((options) => {
           cy.get("[role='option']").contains(options).click();
         });
-        cy.get(selector).click();
+        cy.get(selector).get("#dropdown-toggle").click({ force: true });
       });
   },
 );
diff --git a/src/Components/Form/AutoCompleteAsync.tsx b/src/Components/Form/AutoCompleteAsync.tsx
index b6774f25ef6..9b4c1f876e4 100644
--- a/src/Components/Form/AutoCompleteAsync.tsx
+++ b/src/Components/Form/AutoCompleteAsync.tsx
@@ -141,7 +141,11 @@ const AutoCompleteAsync = (props: Props) => {
                       className="-mb-1.5 animate-spin"
                     />
                   ) : (
-                    <CareIcon icon="l-angle-down" className="-mb-1.5" />
+                    <CareIcon
+                      id="dropdown-toggle"
+                      icon="l-angle-down"
+                      className="-mb-1.5"
+                    />
                   )}
                 </div>
               </ComboboxButton>
diff --git a/src/Components/Form/FormFields/Autocomplete.tsx b/src/Components/Form/FormFields/Autocomplete.tsx
index 96e6f8ae29e..7802a296201 100644
--- a/src/Components/Form/FormFields/Autocomplete.tsx
+++ b/src/Components/Form/FormFields/Autocomplete.tsx
@@ -200,7 +200,7 @@ export const Autocomplete = <T, V>(props: AutocompleteProps<T, V>) => {
                   {props.isLoading ? (
                     <CareIcon icon="l-spinner" className="animate-spin" />
                   ) : (
-                    <CareIcon icon="l-angle-down" />
+                    <CareIcon id="dropdown-toggle" icon="l-angle-down" />
                   )}
                 </div>
               </ComboboxButton>
diff --git a/src/Components/Form/FormFields/AutocompleteMultiselect.tsx b/src/Components/Form/FormFields/AutocompleteMultiselect.tsx
index 61c17927296..7fea2d4c6e7 100644
--- a/src/Components/Form/FormFields/AutocompleteMultiselect.tsx
+++ b/src/Components/Form/FormFields/AutocompleteMultiselect.tsx
@@ -145,7 +145,11 @@ export const AutocompleteMutliSelect = <T, V>(
                   {props.isLoading ? (
                     <CareIcon icon="l-spinner" className="animate-spin" />
                   ) : (
-                    <CareIcon icon="l-angle-down" className="-mb-1.5" />
+                    <CareIcon
+                      id="dropdown-toggle"
+                      icon="l-angle-down"
+                      className="-mb-1.5"
+                    />
                   )}
                 </div>
               </ComboboxButton>
diff --git a/src/Components/Form/MultiSelectMenuV2.tsx b/src/Components/Form/MultiSelectMenuV2.tsx
index 97f97cdb8ba..e728260e142 100644
--- a/src/Components/Form/MultiSelectMenuV2.tsx
+++ b/src/Components/Form/MultiSelectMenuV2.tsx
@@ -127,6 +127,7 @@ const MultiSelectMenuV2 = <T, V>(props: Props<T, V>) => {
                     )}
                   </div>
                   <CareIcon
+                    id="dropdown-toggle"
                     icon="l-angle-down"
                     className="-mb-0.5 text-lg text-secondary-900"
                   />
diff --git a/src/Components/Form/SelectMenuV2.tsx b/src/Components/Form/SelectMenuV2.tsx
index c416472fc12..379eb7b7315 100644
--- a/src/Components/Form/SelectMenuV2.tsx
+++ b/src/Components/Form/SelectMenuV2.tsx
@@ -118,6 +118,7 @@ const SelectMenuV2 = <T, V>(props: SelectMenuProps<T, V>) => {
                 </div>
                 {showChevronIcon && (
                   <CareIcon
+                    id="dropdown-toggle"
                     icon="l-angle-down"
                     className="-mb-0.5 text-lg text-secondary-900"
                   />