From e740ad180d8cdd4804f4bc568412c857f9f2ced9 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Fri, 10 Jun 2022 15:46:50 +0530
Subject: [PATCH] test: fix for failing Data Control UI test (#17133)

---
 cypress/support/commands.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index c64f0bf469..c168b0c201 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -271,10 +271,9 @@ Cypress.Commands.add('save', () => {
 	cy.get(`button[data-label="Save"]:visible`).click({scrollBehavior: false, force: true});
 	cy.wait('@api');
 });
-
 Cypress.Commands.add('hide_dialog', () => {
-	cy.wait(400);
-	cy.get('.btn-modal-close:visible').click({force: true});
+	cy.wait(300);
+	cy.get_open_dialog().focus().find('.btn-modal-close').click();
 	cy.get('.modal:visible').should('not.exist');
 });