diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index f2631edc0..ee124ef0c 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -106,10 +106,10 @@ export class HomePage implements OnInit {
 
 
     this.router.events.subscribe((val) => {
-      document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
-      document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove())
-      document.querySelectorAll('.loading-blocker').forEach((e: any) => e.remove())
-      document.querySelectorAll('ion-popover').forEach((e: any) => e.remove())
+      // document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
+      // document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove())
+      // document.querySelectorAll('.loading-blocker').forEach((e: any) => e.remove())
+      // document.querySelectorAll('ion-popover').forEach((e: any) => e.remove())
     });
 
     window['platform'] = platform
@@ -118,9 +118,9 @@ export class HomePage implements OnInit {
 
       if (window.location.pathname != '/inactivity' && window.location.pathname != '/') {
 
-        document.querySelectorAll('ion-modal').forEach((e: any) => e.remove());
-        document.querySelectorAll('.popover-viewport').forEach((e: any) => e.remove());
-        document.querySelectorAll('.loading-blocker').forEach((e: any) => e.remove());
+        document.querySelectorAll('ion-modal:not(.keep-this)').forEach((e: any) => e.remove());
+        document.querySelectorAll('.popover-viewport:not(.keep-this) ').forEach((e: any) => e.remove());
+        document.querySelectorAll('.loading-blocker:not(.keep-this)').forEach((e: any) => e.remove());
 
         const pathname = window.location.pathname
         SessionStore.setUrlBeforeInactivity(pathname)