diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.html b/demo-shell/src/app/components/app-layout/app-layout.component.html
index 92d19af509..3dc2afb565 100644
--- a/demo-shell/src/app/components/app-layout/app-layout.component.html
+++ b/demo-shell/src/app/components/app-layout/app-layout.component.html
@@ -1,5 +1,5 @@
 <adf-sidenav-layout [sidenavMin]="70" [sidenavMax]="220" [stepOver]="780" [hideSidenav]="hideSidenav"
-    [expandedSidenav]="expandedSidenav" (expanded)="setState($event)" [position]="position">
+    [expandedSidenav]="expandedSidenav" (expanded)="setState($event)" [position]="position" data-automation-id="sidenav-layout">
 
     <adf-sidenav-layout-header>
         <ng-template let-toggleMenu="toggleMenu">
diff --git a/lib/testing/src/lib/core/pages/login.page.ts b/lib/testing/src/lib/core/pages/login.page.ts
index f701a19b84..5d7bc263a7 100644
--- a/lib/testing/src/lib/core/pages/login.page.ts
+++ b/lib/testing/src/lib/core/pages/login.page.ts
@@ -74,6 +74,7 @@ export class LoginPage {
             'settings'
         )
     );
+    sidenavLayout = element(by.css(`[data-automation-id="sidenav-layout"]`));
 
     goToLoginPage() {
         browser.waitForAngularEnabled(true);
@@ -274,6 +275,6 @@ export class LoginPage {
         this.enterUsername(username);
         this.enterPassword(password);
         this.clickSignInButton();
-        return BrowserVisibility.waitUntilElementIsVisible(this.header);
+        return BrowserVisibility.waitUntilElementIsVisible(this.sidenavLayout);
     }
 }