diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html
index 2c5c803b42..52f6176b27 100644
--- a/demo-shell-ng2/app/app.component.html
+++ b/demo-shell-ng2/app/app.component.html
@@ -1,6 +1,6 @@
 <!-- Always shows a header, even in smaller screens. -->
 <div mdl class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
-    <div *ngIf="isLoggedIn()">
+    <div *ngIf="!isLoginPage()">
         <header class="mdl-layout__header">
             <div class="mdl-layout__header-row">
                 <!-- Title -->
diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts
index 849f6ac69c..2f89a4f6da 100644
--- a/demo-shell-ng2/app/app.component.ts
+++ b/demo-shell-ng2/app/app.component.ts
@@ -54,6 +54,10 @@ export class AppComponent {
         return this.auth.isLoggedIn();
     }
 
+    isLoginPage(): boolean {
+        return location.pathname === '/login' || location.pathname === '/';
+    }
+
     onLogout(event) {
         event.preventDefault();
         this.auth.logout()