diff --git a/cypress/support/kaoto-ui-commands/default.js b/cypress/support/kaoto-ui-commands/default.js
index 6747f9611..82cfd1f32 100644
--- a/cypress/support/kaoto-ui-commands/default.js
+++ b/cypress/support/kaoto-ui-commands/default.js
@@ -35,6 +35,7 @@ Cypress.Commands.add('closeCatalogOrCodeEditor', () => {
   cy.get('[data-testid="kaoto-left-drawer"]').within(() => {
     cy.get('.pf-c-drawer__close > .pf-c-button').click();
   });
+  cy.get('[data-testid="kaoto-left-drawer"]').should('be.hidden');
 });
 
 Cypress.Commands.add('openMenuDropDown', () => {
diff --git a/cypress/support/kaoto-ui-commands/steps.js b/cypress/support/kaoto-ui-commands/steps.js
index 566d8877e..42dc9a119 100644
--- a/cypress/support/kaoto-ui-commands/steps.js
+++ b/cypress/support/kaoto-ui-commands/steps.js
@@ -87,6 +87,7 @@ Cypress.Commands.add('closeStepConfigurationTab', () => {
     cy.get('[data-testid="kaoto-right-drawer"]').within(() => {
         cy.get('.pf-c-drawer__close > .pf-c-button').click();
     });
+    cy.get('[data-testid="kaoto-right-drawer"]').should('be.hidden');
 });
 
 Cypress.Commands.add('interactWithConfigInputObject', (inputName, value) => {