diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html
index c5d2a1d1e7..72ef8f04b0 100644
--- a/demo-shell-ng2/app/app.component.html
+++ b/demo-shell-ng2/app/app.component.html
@@ -29,12 +29,12 @@
 
             <ul class="mdl-menu mdl-menu--bottom-right mdl-js-menu mdl-js-ripple-effect"
                 for="demo-menu-lower-right">
-                <li class="mdl-menu__item " (click)="changeLanguage('en')"><span class="flag-icon flag-icon-gb"></span> English</li>
-                <li class="mdl-menu__item" (click)="changeLanguage('gr')"><span class="flag-icon flag-icon-gr"></span> Greek</li>
-                <li class="mdl-menu__item" (click)="changeLanguage('it')"><span class="flag-icon flag-icon-it"></span> Italian</li>
-                <li *ngIf="!isLoggedIn()" class="mdl-menu__item">More</li>
-                <a *ngIf="!isLoggedIn()" class="mdl-menu__item" routerLink="/login">Login</a>
-                <li *ngIf="isLoggedIn()" class="mdl-menu__item" (click)="onLogout($event)">Logout</li>
+                <li class="mdl-menu__item" (click)="changeLanguage('en')"><span class="flag-icon flag-icon-gb"></span><label tabindex="0"> English</label></li>
+                <li class="mdl-menu__item" (click)="changeLanguage('gr')"><span class="flag-icon flag-icon-gr"></span><label tabindex="0"> Greek</label></li>
+                <li class="mdl-menu__item" (click)="changeLanguage('it')"><span class="flag-icon flag-icon-it"></span><label tabindex="0"> Italian</label></li>
+                <li *ngIf="!isLoggedIn()" class="mdl-menu__item"><label tabindex="0">More</label></li>
+                <a *ngIf="!isLoggedIn()" class="mdl-menu__item" routerLink="/login"><label tabindex="0">Login</label></a>
+                <li *ngIf="isLoggedIn()" class="mdl-menu__item" (click)="onLogout($event)"><label tabindex="0">Logout</label></li>
             </ul>
         </div>
     </header>