diff --git a/src/app/dashboard/[subdomain]/comments/page-component.tsx b/src/app/dashboard/[subdomain]/comments/page-component.tsx
index 4df79fc1..4630e6b9 100644
--- a/src/app/dashboard/[subdomain]/comments/page-component.tsx
+++ b/src/app/dashboard/[subdomain]/comments/page-component.tsx
@@ -42,7 +42,7 @@ export default function CommentsPage() {
 
   return (
     <DashboardMain title="Comments">
-      <div className="min-w-[270px] max-w-screen-lg">
+      <div className="min-w-[270px] max-w-screen-lg flex-1 flex flex-col">
         <div className="text-sm text-zinc-500 leading-relaxed">
           <p>
             {t(
@@ -56,11 +56,10 @@ export default function CommentsPage() {
             </UniLink>
           </p>
         </div>
-        <div className="xlog-comment">
-          <div className="prose space-y-4 pt-4">
+        <div className="xlog-comment flex-1 flex">
+          <div className="prose space-y-4 pt-4 flex-1">
             <Virtuoso
               className="xlog-comment-list"
-              useWindowScroll
               data={data}
               endReached={() =>
                 comments.hasNextPage && comments.fetchNextPage()
diff --git a/src/components/dashboard/DashboardMain.tsx b/src/components/dashboard/DashboardMain.tsx
index 90792f6f..e6cb8e1c 100644
--- a/src/components/dashboard/DashboardMain.tsx
+++ b/src/components/dashboard/DashboardMain.tsx
@@ -17,17 +17,16 @@ export const DashboardMain = ({
   const isMobileLayout = useIsMobileLayout()
 
   return (
-    <div className="flex-1">
-      <div
-        className={cn(
-          fullWidth ? "relative" : "min-w-[270px] relative px-5 py-5 md:px-10",
-          className,
-          isMobileLayout ? "max-w-[100vw]" : "",
-        )}
-      >
-        {title && <p className="text-2xl font-bold mb-8">{t(title)}</p>}
-        {children}
-      </div>
+    <div
+      className={cn(
+        fullWidth ? "relative" : "min-w-[270px] relative px-5 py-5 md:px-10",
+        className,
+        isMobileLayout ? "max-w-[100vw]" : "",
+        "min-h-full flex flex-col",
+      )}
+    >
+      {title && <p className="text-2xl font-bold mb-8">{t(title)}</p>}
+      {children}
     </div>
   )
 }