diff --git a/cypress/integration/awesome_bar.js b/cypress/integration/awesome_bar.js
index 2eb884a76a..f82fe19c24 100644
--- a/cypress/integration/awesome_bar.js
+++ b/cypress/integration/awesome_bar.js
@@ -10,6 +10,7 @@ context("Awesome Bar", () => {
 	});
 
 	beforeEach(() => {
+		cy.get("body").click(0, 0); // Click on some blank space to avoid any modals.
 		let txt = `Search or type a command (${
 			window.navigator.platform === "MacIntel" ? "⌘" : "Ctrl"
 		} + K)`;
@@ -17,6 +18,7 @@ context("Awesome Bar", () => {
 		cy.get("@awesome_bar_search").click();
 		cy.get("#navbar-search").as("awesome_bar");
 		cy.get("#navbar-search").type("{selectall}");
+		cy.wait(400);
 	});
 
 	after(() => {
@@ -26,7 +28,6 @@ context("Awesome Bar", () => {
 
 	it("opens awesome bar on click", () => {
 		cy.get("@awesome_bar").should("be.visible");
-		cy.get("body").click(15, 40);
 	});
 
 	it("navigates to doctype list", () => {
@@ -52,6 +53,8 @@ context("Awesome Bar", () => {
 		cy.wait(200); // Wait a bit longer before checking the filter.
 		cy.get('[data-original-title="ID"]:visible > input').as("filter");
 		cy.get("@filter").should("have.value", "%test%");
+		cy.get("@awesome_bar_search").click();
+		cy.wait(400);
 		cy.get("@awesome_bar").type("anothertest in todo");
 		cy.wait(200); // Wait a bit longer before hitting enter.
 		cy.get("@awesome_bar").type("{enter}");