diff --git a/e2e/src/all-basic-routes-without-error.e2e.ts b/e2e/src/all-basic-routes-without-error.e2e.ts
index d18e17c4cf..bcf2e8db6f 100644
--- a/e2e/src/all-basic-routes-without-error.e2e.ts
+++ b/e2e/src/all-basic-routes-without-error.e2e.ts
@@ -13,20 +13,17 @@ module.exports = {
       .loadAppAndClickAwayWelcomeDialog(TARGET_URL)
       .url(`${BASE}/#/tag/TODAY/schedule`)
 
-      .click('section.main > side-nav-item > button')
-      .click('section.main > button:nth-of-type(1)')
+      .click('side-nav section.main > side-nav-item > button')
+      .click('side-nav section.main > button:nth-of-type(1)')
       .waitForElementVisible(CANCEL_BTN)
       .click(CANCEL_BTN)
 
-      .click('section.main > button:nth-of-type(2)')
+      .click('side-nav section.main > button:nth-of-type(2)')
 
-      .click('section.projects button')
-      .click('section.tags button')
+      .click('side-nav section.projects button')
+      .click('side-nav section.tags button')
 
-      .click('section.app > button:nth-of-type(1)')
-      // .click('section.app > button:nth-of-type(2)')
-      // .waitForElementVisible('.cdk-overlay-backdrop')
-      // .click('.cdk-overlay-backdrop')
+      .click('side-nav section.app > button:nth-of-type(1)')
       .click('button.tour-settingsMenuBtn')
 
       .url(`${BASE}/#/tag/TODAY/quick-history`)