diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index 0d408c03..7a4f9c5b 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -362,6 +362,7 @@
         try
         {
             _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
+            _pages = _pages.OrderBy(item => item.ParentId).ThenBy(item => item.Order).ToList();
             _pageId = Int32.Parse(PageState.QueryString["id"]);
             _page = await PageService.GetPageAsync(_pageId);
             _icons = await SystemService.GetIconsAsync();