diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index d52f4c91..f544ee39 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -124,6 +124,10 @@
 			editmode = PageState.EditMode;
 			lastsyncdate = PageState.LastSyncDate;
 		}
+		if (PageState?.Page.Path != route.PagePath)
+		{
+			editmode = false; // reset edit mode when navigating to different page
+		}
 
 		// get user
 		if (PageState == null || refresh || PageState.Alias.SiteId != SiteState.Alias.SiteId)
@@ -187,11 +191,6 @@
 				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)