diff --git a/client/src/app/home/home.component.ts b/client/src/app/home/home.component.ts
index 38fc3d292..9f83ff530 100644
--- a/client/src/app/home/home.component.ts
+++ b/client/src/app/home/home.component.ts
@@ -154,7 +154,7 @@ export class HomeComponent implements OnInit, AfterViewInit, OnDestroy {
         if (viewId === this.viewAsAlarms) {
             this.onAlarmsShowMode('expand');
             this.checkToCloseSideNav();
-        } else if (this.homeView && viewId !== this.homeView.id || force || !this.homeView) {
+        } else if (!this.homeView || viewId !== this.homeView?.id || force || this.fuxaview.view?.id !== viewId) {
             const view = this.hmi.views.find(x => x.id === viewId);
             this.setIframe();
             this.showHomeLink = false;