diff --git a/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentAddEventPage.feature b/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentAddEventPage.feature
index f5db1e30e2..bcdfb2ff8a 100644
--- a/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentAddEventPage.feature
+++ b/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentAddEventPage.feature
@@ -16,13 +16,16 @@ Feature: The user interacts with the widgets on the enrollment add event page
 
   Scenario: User can close the Enrollment Widget
     Given you land on the enrollment add event page by having typed #/enrollmentEventNew?programId=IpHINAT79UW&orgUnitId=DiszpKrYNg8&teiId=EaOyKGOIGRp&enrollmentId=wBU0RAsYjKE&stageId=A03MvHHogjR
+    And the enrollment widget should be opened
     When you click the enrollment widget toggle open close button
     Then the enrollment widget should be closed
 
   Scenario: User can close and reopen the Enrollment Widget
     Given you land on the enrollment add event page by having typed #/enrollmentEventNew?programId=IpHINAT79UW&orgUnitId=DiszpKrYNg8&teiId=EaOyKGOIGRp&enrollmentId=wBU0RAsYjKE&stageId=A03MvHHogjR
+    And the enrollment widget should be opened
+    When you click the enrollment widget toggle open close button
+    Then the enrollment widget should be closed
     When you click the enrollment widget toggle open close button
-    And you click the enrollment widget toggle open close button
     Then the enrollment widget should be opened
 
   Scenario: User can see the enrollment details
diff --git a/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard.feature b/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard.feature
index c71f98ef99..89af2a7ea9 100644
--- a/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard.feature
+++ b/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard.feature
@@ -48,13 +48,16 @@ Feature: The user interacts with the widgets on the enrollment dashboard
 
   Scenario: User can close the Enrollment Widget
     Given you land on the enrollment dashboard page by having typed #/enrollment?enrollmentId=wBU0RAsYjKE
+    And the enrollment widget should be opened
     When you click the enrollment widget toggle open close button
     Then the enrollment widget should be closed
 
   Scenario: User can close and reopen the Enrollment Widget
     Given you land on the enrollment dashboard page by having typed #/enrollment?enrollmentId=wBU0RAsYjKE
+    And the enrollment widget should be opened
+    When you click the enrollment widget toggle open close button
+    Then the enrollment widget should be closed
     When you click the enrollment widget toggle open close button
-    And you click the enrollment widget toggle open close button
     Then the enrollment widget should be opened
 
   Scenario: User can see the enrollment details
diff --git a/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentEditEvent.feature b/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentEditEvent.feature
index 1f551735a3..c3add0d727 100644
--- a/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentEditEvent.feature
+++ b/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEnrollmentEditEvent.feature
@@ -16,13 +16,16 @@ Feature: The user interacts with the widgets on the enrollment edit event
 
   Scenario: User can close the Enrollment Widget
     Given you land on the enrollment edit event page by having typed /#/enrollmentEventEdit?eventId=XGLkLlOXgmE&orgUnitId=DiszpKrYNg8
+    And the enrollment widget should be opened
     When you click the enrollment widget toggle open close button
     Then the enrollment widget should be closed
 
   Scenario: User can close and reopen the Enrollment Widget
     Given you land on the enrollment edit event page by having typed /#/enrollmentEventEdit?eventId=XGLkLlOXgmE&orgUnitId=DiszpKrYNg8
+    And the enrollment widget should be opened
+    When you click the enrollment widget toggle open close button
+    Then the enrollment widget should be closed
     When you click the enrollment widget toggle open close button
-    And you click the enrollment widget toggle open close button
     Then the enrollment widget should be opened
 
   Scenario: User can see the enrollment details