From 05b34e9d00bf44b69bd1df67a85e604ab00f604a Mon Sep 17 00:00:00 2001
From: Daniel Riera <driera@livefront.com>
Date: Tue, 17 Jun 2025 14:31:11 -0400
Subject: [PATCH] PM-21160 (#15125)

---
 .../platform/popup/view-cache/popup-router-cache.service.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts b/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
index 5fc508ac2a6..bac435e2e8d 100644
--- a/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
+++ b/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
@@ -105,9 +105,11 @@ export class PopupRouterCacheService {
    * Navigate back in history
    */
   async back() {
-    await this.state.update((prevState) => (prevState ? prevState.slice(0, -1) : []));
+    const history = await this.state.update((prevState) =>
+      prevState ? prevState.slice(0, -1) : [],
+    );
 
-    if (this.hasNavigated) {
+    if (this.hasNavigated && history.length) {
       this.location.back();
       return;
     }