diff --git a/src/app/api/pages/route.ts b/src/app/api/pages/route.ts
index 3722ee18..c61480c8 100644
--- a/src/app/api/pages/route.ts
+++ b/src/app/api/pages/route.ts
@@ -1,5 +1,5 @@
 import { NextServerResponse, getQuery } from "~/lib/server-helper"
-import { PageVisibilityEnum } from "~/lib/types"
+import { PageVisibilityEnum, PagesSortTypes } from "~/lib/types"
 import { getPagesBySite } from "~/models/page.model"
 
 export async function GET(req: Request) {
@@ -13,6 +13,7 @@ export async function GET(req: Request) {
     cursor: query.cursor as string,
     useStat: true,
     skipExpansion: query.skipExpansion === "true",
+    sortType: query.sortType as PagesSortTypes,
     ...(query.tags && {
       tags: Array.isArray(query.tags)
         ? (query.tags as string[])
diff --git a/src/app/site/[site]/page.tsx b/src/app/site/[site]/page.tsx
index e8a97d08..f6652f28 100644
--- a/src/app/site/[site]/page.tsx
+++ b/src/app/site/[site]/page.tsx
@@ -27,6 +27,7 @@ async function SiteIndexPage({
       visibility: PageVisibilityEnum.Published,
       useStat: true,
       limit: 18,
+      sortType: "latest",
     },
     queryClient,
   )
diff --git a/src/components/site/SiteHome.tsx b/src/components/site/SiteHome.tsx
index 4b16ee89..f50dbccb 100644
--- a/src/components/site/SiteHome.tsx
+++ b/src/components/site/SiteHome.tsx
@@ -1,7 +1,10 @@
 "use client"
 
+import { useState } from "react"
+
 import PostList from "~/components/site/PostList"
-import { NoteType, PageVisibilityEnum } from "~/lib/types"
+import { type TabItem, Tabs } from "~/components/ui/Tabs"
+import { NoteType, PageVisibilityEnum, PagesSortTypes } from "~/lib/types"
 import { useGetPagesBySiteLite, usePinnedPage } from "~/queries/page"
 import { useGetSite } from "~/queries/site"
 
@@ -13,19 +16,61 @@ export default function SiteHome({
   type?: NoteType
 }) {
   const site = useGetSite(handle)
+  const [sortType, setSortType] = useState<PagesSortTypes>("latest")
   const posts = useGetPagesBySiteLite({
     characterId: site.data?.characterId,
     type: type || ["post", "portfolio"],
     visibility: PageVisibilityEnum.Published,
     useStat: true,
     limit: type === "short" ? 20 : 18,
+    sortType: sortType,
   })
   const pinnedPage = usePinnedPage({ characterId: site.data?.characterId })
 
-  if (!posts.data?.pages?.length) return null
+  let tabs: TabItem[]
+  switch (type) {
+    case "portfolio":
+      tabs = []
+      break
+    case "short":
+      tabs = [
+        {
+          text: "Latest",
+          onClick: () => setSortType("latest"),
+          active: sortType === "latest",
+        },
+        {
+          text: "Most Commented",
+          onClick: () => setSortType("commented"),
+          active: sortType === "commented",
+        },
+      ]
+      break
+    default:
+      tabs = [
+        {
+          text: "Latest",
+          onClick: () => setSortType("latest"),
+          active: sortType === "latest",
+        },
+        {
+          text: "Hottest",
+          onClick: () => setSortType("hottest"),
+          active: sortType === "hottest",
+        },
+        {
+          text: "Most Commented",
+          onClick: () => setSortType("commented"),
+          active: sortType === "commented",
+        },
+      ]
+      break
+  }
 
   return (
     <>
+      <Tabs items={tabs} className="border-none mb-4 -mt-3" />
+      {!posts.data?.pages?.length && posts.isLoading && <>Loading...</>}
       <PostList
         posts={posts}
         pinnedNoteId={pinnedPage.noteId}
diff --git a/src/lib/i18n/locales/zh/dashboard.json b/src/lib/i18n/locales/zh/dashboard.json
index 6c6cc822..b20856a6 100644
--- a/src/lib/i18n/locales/zh/dashboard.json
+++ b/src/lib/i18n/locales/zh/dashboard.json
@@ -194,6 +194,7 @@
   "Hottest": "最热",
   "Latest": "最新",
   "Following": "关注",
+  "Most Commented": "最多评论",
   "Create a Post": "创建文章",
   "Change Site Icon or domain": "更改站点图标或域名",
   "Join xLog's Discord channel": "加入 xLog 的 Discord 频道",
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 15373228..1b190844 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -27,6 +27,8 @@ export enum PageVisibilityEnum {
   Modified = "published and local modified",
 }
 
+export type PagesSortTypes = "latest" | "hottest" | "commented"
+
 export type PostOnSiteHome = {
   id: string
   title: string
diff --git a/src/models/page.model.ts b/src/models/page.model.ts
index 57174664..b3c3d3d5 100644
--- a/src/models/page.model.ts
+++ b/src/models/page.model.ts
@@ -20,7 +20,12 @@ import { filterCommentCharacter } from "~/lib/filter-character"
 import { getNoteSlug } from "~/lib/helpers"
 import { checkSlugReservedWords } from "~/lib/slug-reserved-words"
 import { getKeys, getStorage } from "~/lib/storage"
-import { ExpandedNote, NoteType, PageVisibilityEnum } from "~/lib/types"
+import {
+  ExpandedNote,
+  NoteType,
+  PageVisibilityEnum,
+  PagesSortTypes,
+} from "~/lib/types"
 import { client } from "~/queries/graphql"
 
 export const PINNED_PAGE_KEY = "xlog_pinned_page"
@@ -120,6 +125,7 @@ export async function getPagesBySite(input: {
   keepBody?: boolean
   handle?: string // In order to be compatible with old drafts
   skipExpansion?: boolean
+  sortType?: PagesSortTypes
 }) {
   if (!input.characterId) {
     return {
@@ -210,6 +216,31 @@ export async function getPagesBySite(input: {
   `
   const limit = (input.limit || 12) - (pinnedNote ? 1 : 0)
 
+  let orderBy
+  switch (input.sortType) {
+    case "hottest":
+      orderBy = `{
+        stat: {
+          viewDetailCount:desc
+        }
+      }`
+      break
+    case "commented":
+      orderBy = `{
+        fromNotes: {
+          _count: desc
+        }
+      }`
+      break
+    default:
+      orderBy = `{
+        publishedAt: {
+          sort: desc
+        }
+      }`
+      break
+  }
+
   const { data } = await client
     .query(
       gql`
@@ -217,11 +248,7 @@ export async function getPagesBySite(input: {
           noteCount(where: ${whereQuery}),
           notes(
             where: ${whereQuery},
-            orderBy: [{
-              publishedAt: {
-                sort: desc
-              }
-            }],
+            orderBy: [${orderBy}],
             take: $limit,
             ${cursorQuery}
           ) {
@@ -351,25 +378,6 @@ export async function getPagesBySite(input: {
       break
   }
 
-  expandedNotes.list.sort((a, b) => {
-    if (
-      !a.metadata?.content?.date_published ||
-      a.noteId === expandedNotes.pinnedNoteId
-    ) {
-      return -1
-    } else if (
-      !b.metadata?.content?.date_published ||
-      b.noteId === expandedNotes.pinnedNoteId
-    ) {
-      return 1
-    } else {
-      return (
-        +new Date(b.metadata?.content?.date_published) -
-        +new Date(a.metadata?.content?.date_published)
-      )
-    }
-  })
-
   return expandedNotes
 }