diff --git a/crm/repository/page.go b/crm/repository/page.go
index 821388baf..18881a1a1 100644
--- a/crm/repository/page.go
+++ b/crm/repository/page.go
@@ -68,9 +68,8 @@ func (r *page) FindBySelfID(selfID uint64) (types.PageSet, error) {
 	return pages, nil
 }
 
-// Find returns all of non-record pages
 func (r *page) Find() (set types.PageSet, err error) {
-	return set, r.db().Select(&set, "SELECT * FROM crm_page WHERE module_id = 0 ORDER BY self_id, weight ASC")
+	return set, r.db().Select(&set, "SELECT * FROM crm_page ORDER BY self_id, weight ASC")
 }
 
 func (r *page) Reorder(selfID uint64, pageIDs []uint64) error {
diff --git a/crm/service/page.go b/crm/service/page.go
index 14d0591bd..db326f1b1 100644
--- a/crm/service/page.go
+++ b/crm/service/page.go
@@ -107,7 +107,9 @@ func (s *page) Tree() (pages types.PageSet, err error) {
 
 				c.Children = append(c.Children, p)
 			} else {
-				// Ignore orphans :(
+				// Move orphans to root
+				p.SelfID = 0
+				tree = append(tree, p)
 			}
 
 			return nil