diff --git a/cypress/integration/custom_buttons.js b/cypress/integration/custom_buttons.js
index ac3027bfba..a0a0bf34f6 100644
--- a/cypress/integration/custom_buttons.js
+++ b/cypress/integration/custom_buttons.js
@@ -42,7 +42,12 @@ describe(
 			cy.login();
 			cy.visit(`/desk/note/new`);
 			// close the sidebar cause default is expanded
-			cy.get(".body-sidebar .collapse-sidebar-link").click();
+			cy.get(".body-sidebar-container").then(($sidebar) => {
+				if ($sidebar.hasClass("expanded")) {
+					cy.get(".body-sidebar .collapse-sidebar-link").click();
+					cy.get(".body-sidebar-container").should("not.have.class", "expanded");
+				}
+			});
 		});
 
 		test_button_names.forEach((button_name) => {