diff --git a/frontend/src/ts/modules/webbpm/component/webbpm.component.ts b/frontend/src/ts/modules/webbpm/component/webbpm.component.ts
index 43f582c3..193f4020 100644
--- a/frontend/src/ts/modules/webbpm/component/webbpm.component.ts
+++ b/frontend/src/ts/modules/webbpm/component/webbpm.component.ts
@@ -32,19 +32,16 @@ export class WebbpmComponent {
 
       if (event instanceof NavigationEnd) {
         let navigationEnd = (<NavigationEnd>event);
+        $(elementRef.nativeElement).removeClass('citizen');
+        $(elementRef.nativeElement).removeClass('citizencard');
 
         if (navigationEnd.urlAfterRedirects.startsWith('/citizencard/')) {
-          $(elementRef.nativeElement).removeClass('citizen');
           $(elementRef.nativeElement).addClass('citizencard');
         }
-        else if (navigationEnd.urlAfterRedirects.startsWith('/citizen')) {
-          $(elementRef.nativeElement).removeClass('citizencard');
+        else if (navigationEnd.urlAfterRedirects.startsWith('/citizen') ||
+                 navigationEnd.urlAfterRedirects.startsWith('/citizen_all_filters')) {
           $(elementRef.nativeElement).addClass('citizen');
         }
-        else {
-          $(elementRef.nativeElement).removeClass('citizen');
-          $(elementRef.nativeElement).removeClass('citizencard');
-        }
       }
     })
   }