diff --git a/projects/common/src/fm/services/full-screen-guard.service.ts b/projects/common/src/fm/services/full-screen-guard.service.ts
index 9e36f5a..9238eb4 100644
--- a/projects/common/src/fm/services/full-screen-guard.service.ts
+++ b/projects/common/src/fm/services/full-screen-guard.service.ts
@@ -1,22 +1,30 @@
-import { Injectable } from '@angular/core';
-import { CanLoad, Route, CanActivate, CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
-
-import { Store } from '@ngrx/store';
-
-import * as appCommonReducer from '../reducers/app-common.reducer'
-import * as appCommonActions from '../actions/app-common.actions';
-
-
-@Injectable({
-  providedIn: 'root',
-})
-export class FullScreenGuard implements CanActivate { 
- 
-  private loginDispatched = false;
-  constructor(private store: Store<appCommonReducer.State> ) { }
-
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
-    this.store.dispatch(new appCommonActions.FullScreen());
-    return true;
-  } 
-}
+import { Injectable } from '@angular/core';
+import { CanActivate, CanActivateChild, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
+
+import { Store } from '@ngrx/store';
+
+import * as appCommonReducer from '../reducers/app-common.reducer'
+import * as appCommonActions from '../actions/app-common.actions';
+
+
+@Injectable({
+  providedIn: 'root',
+})
+export class FullScreenGuard implements CanActivate,CanActivateChild { 
+ 
+  private loginDispatched = false;
+  constructor(private store: Store<appCommonReducer.State> ) { }
+
+  setFullScreen():boolean {
+    this.store.dispatch(new appCommonActions.FullScreen());
+    return true;
+  }
+
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+    return this.setFullScreen();
+  } 
+
+  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+    return this.setFullScreen();
+  } 
+}
diff --git a/projects/common/src/fm/services/nav-bar-guard.service.ts b/projects/common/src/fm/services/nav-bar-guard.service.ts
index 5a82428..be6b91e 100644
--- a/projects/common/src/fm/services/nav-bar-guard.service.ts
+++ b/projects/common/src/fm/services/nav-bar-guard.service.ts
@@ -1,22 +1,30 @@
-import { Injectable } from '@angular/core';
-import { CanLoad, Route, CanActivate, CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-
-import { Store } from '@ngrx/store';
-
-import * as appCommonReducer from '../reducers/app-common.reducer'
-import * as appCommonActions from '../actions/app-common.actions';
-
-
-@Injectable({
-  providedIn: 'root',
-})
-export class NavBarGuard implements CanActivate {
-
-  private loginDispatched = false;
-  constructor(private store: Store<appCommonReducer.State>) { }
-
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
-    this.store.dispatch(new appCommonActions.ShowNavBar());
-    return true;
-  }
-}
+import { Injectable } from '@angular/core';
+import { CanLoad, Route, CanActivate, CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+
+import { Store } from '@ngrx/store';
+
+import * as appCommonReducer from '../reducers/app-common.reducer'
+import * as appCommonActions from '../actions/app-common.actions';
+
+
+@Injectable({
+  providedIn: 'root',
+})
+export class NavBarGuard implements CanActivate {
+
+  private loginDispatched = false;
+  constructor(private store: Store<appCommonReducer.State>) { }
+
+  setNavBar():boolean {
+    this.store.dispatch(new appCommonActions.ShowNavBar());
+    return true;
+  }
+
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+    return this.setNavBar();
+  } 
+
+  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+    return this.setNavBar();
+  } 
+}