diff --git a/cypress/integration/test_organizational_chart_desktop.js b/cypress/integration/test_organizational_chart_desktop.js
index 516d254..cb12eb5 100644
--- a/cypress/integration/test_organizational_chart_desktop.js
+++ b/cypress/integration/test_organizational_chart_desktop.js
@@ -5,14 +5,15 @@
 		cy.awesomebar('Organizational Chart');
 
 		cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
-		cy.get('@input').clear().type('Test Org Chart');
+		cy.get('@input').clear().wait(200).type('Test Org Chart');
+		cy.get('@input').type('{enter}', { delay: 100 });
+		cy.get('@input').blur();
 
-		cy.get('body').click();
 		cy.wait(500);
 	});
 
 	beforeEach(() => {
-		cy.window().its('frappe').then(frappe => {
+		return cy.window().its('frappe').then(frappe => {
 			return frappe.call('erpnext.tests.ui_test_helpers.create_employee_records');
 		}).as('employee_records');
 	});
diff --git a/cypress/integration/test_organizational_chart_mobile.js b/cypress/integration/test_organizational_chart_mobile.js
index 503db68..a1d3c00 100644
--- a/cypress/integration/test_organizational_chart_mobile.js
+++ b/cypress/integration/test_organizational_chart_mobile.js
@@ -6,9 +6,10 @@
 		cy.awesomebar('Organizational Chart');
 
 		cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
-		cy.get('@input').clear().type('Test Org Chart');
+		cy.get('@input').clear().wait(200).type('Test Org Chart');
+		cy.get('@input').type('{enter}', { delay: 100 });
+		cy.get('@input').blur();
 
-		cy.get('body').click();
 		cy.wait(500);
 	});
 
@@ -16,7 +17,7 @@
 		cy.viewport(375, 667);
 		cy.wait(500);
 
-		cy.window().its('frappe').then(frappe => {
+		return cy.window().its('frappe').then(frappe => {
 			return frappe.call('erpnext.tests.ui_test_helpers.create_employee_records');
 		}).as('employee_records');
 	});
@@ -163,13 +164,15 @@
 	});
 
 	it('goes to the respective level after clicking on non-collapsed sibling group', () => {
-		// click on non-collapsed sibling group
-		cy.get('.hierarchy-mobile')
-			.prev()
-			.click();
+		cy.get('@employee_records').then(() => {
+			// click on non-collapsed sibling group
+			cy.get('.hierarchy-mobile')
+				.prev()
+				.click();
 
-		// should take you to that level
-		cy.get('.hierarchy-mobile').find('li.level .node-card').should('have.length', 2);
+			// should take you to that level
+			cy.get('.hierarchy-mobile').find('li.level .node-card').should('have.length', 2);
+		});
 	});
 
 	it('edit node navigates to employee master', () => {