From 27cd423ebc88bf9d11b00b2d61e410acff7695ee Mon Sep 17 00:00:00 2001
From: Greg Johnston <greg.johnston@gmail.com>
Date: Wed, 24 Sep 2025 19:39:31 -0400
Subject: [PATCH] fix: correctly update path stack when navigating backwards
 (closes #4324)

---
 router/src/location/history.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/router/src/location/history.rs b/router/src/location/history.rs
index 8bbfdb09d..94481cf74 100644
--- a/router/src/location/history.rs
+++ b/router/src/location/history.rs
@@ -185,11 +185,15 @@ impl LocationProvider for BrowserUrl {
             let is_back = self.is_back.clone();
             move || match Self::current() {
                 Ok(new_url) => {
-                    let stack = path_stack.read_value();
+                    let mut stack = path_stack.write_value();
                     let is_navigating_back = stack.len() == 1
                         || (stack.len() >= 2
                             && stack.get(stack.len() - 2) == Some(&new_url));
 
+                    if is_navigating_back {
+                        stack.pop();
+                    }
+
                     is_back.set(is_navigating_back);
 
                     url.set(new_url);