diff --git a/tests/cypress/support/commands.ts b/tests/cypress/support/commands.ts
index 7ded7108..febbbbc1 100644
--- a/tests/cypress/support/commands.ts
+++ b/tests/cypress/support/commands.ts
@@ -216,14 +216,20 @@ Cypress.Commands.add('nameSpaceMenuToggle', (namespaceName) => {
   cy.get('.top > .ns-filter').should('be.visible');
 
   // For some reason I don't understand, click force doesn't work
-  // in 2.10, but it is mandatory for earlier versions
-  // TODO: this is a workaround. Please improve it.
-  if (/\/2\.10/.test(Cypress.env('rancher_version'))) {
-    cy.get('.top > .ns-filter').click();  
-  }
-  else {
+  // in 2.10 an onwards, but it is mandatory for earlier versions
+  // To be improved in the future
+
+  const rancherVersion = Cypress.env('rancher_version');
+  const old_versions = ["latest/devel/2.7", "latest/devel/2.8", "latest/devel/2.9"];
+
+  if (old_versions.includes(rancherVersion)) {
+    cy.log('Rancher version is: ' + rancherVersion , 'Clicking WITH force:true');
     cy.get('.top > .ns-filter').click({ force: true });
   }
+  else  {
+    cy.log('Rancher version is: ' + rancherVersion, 'Clicking WITHOUT force:true');
+    cy.get('.top > .ns-filter').click();
+  }
   cy.get('div.ns-item').contains(namespaceName).scrollIntoView()
   cy.get('div.ns-item').contains(namespaceName).click()
   cy.get('div.ns-dropdown.ns-open > i.icon.icon-chevron-up').click({ force: true });