diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 9bcdc3a4..d52f4c91 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -181,13 +181,17 @@
 			if (PageState == null || refresh || PageState.Page.Path != route.PagePath)
 			{
 				page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));
-				editmode = false;
 			}
 			else
 			{
 				page = PageState.Page;
 			}
 
+			if (PageState?.Page.Path != route.PagePath)
+			{
+				editmode = false;
+			}
+
 			if (page == null && route.PagePath == "") // naked path refers to site home page
 			{
 				if (site.HomePageId != null)