diff --git a/apps/web/src/components/pure/footer/styles.ts b/apps/web/src/components/pure/footer/styles.ts
index cc4b9b50ab..5b24fc34c4 100644
--- a/apps/web/src/components/pure/footer/styles.ts
+++ b/apps/web/src/components/pure/footer/styles.ts
@@ -48,8 +48,7 @@ export const StyleWorkspaceTitle = styled('div')(() => {
 });
 
 export const StyledFooter = styled('div')({
-  height: '84px',
-  padding: '0 40px',
+  padding: '20px 40px',
   flexShrink: 0,
   ...displayFlex('space-between', 'center'),
 });
diff --git a/apps/web/src/components/pure/workspace-list-modal/index.tsx b/apps/web/src/components/pure/workspace-list-modal/index.tsx
index a35d033ce5..dab3c8462a 100644
--- a/apps/web/src/components/pure/workspace-list-modal/index.tsx
+++ b/apps/web/src/components/pure/workspace-list-modal/index.tsx
@@ -6,6 +6,7 @@ import {
   ModalWrapper,
   Tooltip,
 } from '@affine/component';
+import { ScrollableContainer } from '@affine/component';
 import { WorkspaceList } from '@affine/component/workspace-list';
 import type {
   AffineLegacyCloudWorkspace,
@@ -105,7 +106,7 @@ export const WorkspaceListModal = ({
             />
           </StyledOperationWrapper>
         </StyledModalHeader>
-
+        <ScrollableContainer>
         <StyledModalContent>
           <WorkspaceList
             disabled={disabled}
@@ -128,6 +129,7 @@ export const WorkspaceListModal = ({
             )}
           />
           {!environment.isDesktop && (
+            <div>
             <StyledCreateWorkspaceCard
               onClick={onNewWorkspace}
               data-testid="new-workspace"
@@ -143,6 +145,7 @@ export const WorkspaceListModal = ({
                 <p>{t['Create Or Import']()}</p>
               </StyleWorkspaceInfo>
             </StyledCreateWorkspaceCard>
+            </div>
           )}
 
           {environment.isDesktop && (
@@ -218,7 +221,7 @@ export const WorkspaceListModal = ({
             </Menu>
           )}
         </StyledModalContent>
-
+        </ScrollableContainer>
         <Footer user={user} onLogin={onClickLogin} onLogout={onClickLogout} />
       </ModalWrapper>
     </Modal>
diff --git a/apps/web/src/components/pure/workspace-list-modal/styles.ts b/apps/web/src/components/pure/workspace-list-modal/styles.ts
index cbb83e1a10..0f472d939c 100644
--- a/apps/web/src/components/pure/workspace-list-modal/styles.ts
+++ b/apps/web/src/components/pure/workspace-list-modal/styles.ts
@@ -45,6 +45,7 @@ export const StyledCreateWorkspaceCard = styled('div')(() => {
   return {
     width: '310px',
     height: '124px',
+    marginBottom: '24px',
     cursor: 'pointer',
     padding: '16px',
     boxShadow: 'var(--affine-shadow-1)',
@@ -133,10 +134,8 @@ export const StyledHelperContainer = styled('div')(() => {
 });
 
 export const StyledModalContent = styled('div')({
-  height: '534px',
+  height: '540px',
   padding: '8px 40px',
-  marginTop: '72px',
-  overflow: 'auto',
   ...displayFlex('space-between', 'flex-start', 'flex-start'),
   flexWrap: 'wrap',
 });
@@ -163,12 +162,11 @@ export const StyleWorkspaceAdd = styled('div')(() => {
 export const StyledModalHeader = styled('div')(() => {
   return {
     width: '100%',
-    height: '72px',
-    position: 'absolute',
+    marginTop: '10px',
     left: 0,
     top: 0,
     borderRadius: '24px 24px 0 0',
-    padding: '0 40px',
+    padding: '10px 40px',
     ...displayFlex('space-between', 'center'),
   };
 });
diff --git a/packages/component/src/components/page-list/all-page.tsx b/packages/component/src/components/page-list/all-page.tsx
index d239b43646..c5310f1da4 100644
--- a/packages/component/src/components/page-list/all-page.tsx
+++ b/packages/component/src/components/page-list/all-page.tsx
@@ -5,7 +5,7 @@ import { useMediaQuery, useTheme } from '@mui/material';
 import type React from 'react';
 import { type CSSProperties } from 'react';
 
-import { Table, TableBody, TableCell, TableHead, TableHeadRow } from '../..';
+import { ScrollableContainer, Table, TableBody, TableCell, TableHead, TableHeadRow } from '../..';
 import { TableBodyRow } from '../../ui/table';
 import { useHasScrollTop } from '../app-sidebar/sidebar-containers/use-has-scroll-top';
 import { AllPagesBody } from './all-pages-body';
@@ -121,13 +121,15 @@ export const PageList = ({
   const isSmallDevices = useIsSmallDevices();
   if (isSmallDevices) {
     return (
-      <AllPageListMobileView
-        isPublicWorkspace={isPublicWorkspace}
-        createNewPage={onCreateNewPage}
-        createNewEdgeless={onCreateNewEdgeless}
-        importFile={onImportFile}
-        list={sorter.data}
-      />
+      <ScrollableContainer inTableView>
+        <AllPageListMobileView
+          isPublicWorkspace={isPublicWorkspace}
+          createNewPage={onCreateNewPage}
+          createNewEdgeless={onCreateNewEdgeless}
+          importFile={onImportFile}
+          list={sorter.data}
+        />
+      </ScrollableContainer>
     );
   }
 
@@ -140,23 +142,30 @@ export const PageList = ({
       : undefined;
 
   return (
-    <StyledTableContainer ref={ref}>
-      <Table showBorder={hasScrollTop} style={{ maxHeight: '100%' }}>
-        <AllPagesHead
-          isPublicWorkspace={isPublicWorkspace}
-          sorter={sorter}
-          createNewPage={onCreateNewPage}
-          createNewEdgeless={onCreateNewEdgeless}
-          importFile={onImportFile}
-        />
-        <AllPagesBody
-          isPublicWorkspace={isPublicWorkspace}
-          groupKey={groupKey}
-          data={sorter.data}
-        />
-      </Table>
-      {sorter.data.length === 0 && fallback ? fallback : null}
+    sorter.data.length === 0 && fallback ?
+    <StyledTableContainer>
+     {fallback}
     </StyledTableContainer>
+   :
+    <ScrollableContainer inTableView>
+      <StyledTableContainer ref={ref}>
+        <Table showBorder={hasScrollTop} style={{ maxHeight: '100%' }}>
+          <AllPagesHead
+            isPublicWorkspace={isPublicWorkspace}
+            sorter={sorter}
+            createNewPage={onCreateNewPage}
+            createNewEdgeless={onCreateNewEdgeless}
+            importFile={onImportFile}
+          />
+          <AllPagesBody
+            
+            isPublicWorkspace={isPublicWorkspace}
+            groupKey={groupKey}
+            data={sorter.data}
+          />
+        </Table>
+      </StyledTableContainer>
+    </ScrollableContainer>
   );
 };
 
@@ -238,12 +247,18 @@ export const PageListTrashView: React.FC<{
   );
 
   return (
-    <StyledTableContainer ref={ref}>
-      <Table showBorder={hasScrollTop}>
-        <TrashListHead />
-        <TableBody>{ListItems}</TableBody>
-      </Table>
-      {list.length === 0 && fallback ? fallback : null}
+    list.length === 0 && fallback ?
+    <StyledTableContainer>
+    {fallback}
     </StyledTableContainer>
+  :
+    <ScrollableContainer inTableView>
+      <StyledTableContainer ref={ref}>
+        <Table showBorder={hasScrollTop}>
+          <TrashListHead />
+          <TableBody>{ListItems}</TableBody>
+        </Table>
+      </StyledTableContainer>
+    </ScrollableContainer>
   );
 };
diff --git a/packages/component/src/components/page-list/styles.ts b/packages/component/src/components/page-list/styles.ts
index 40864fdb11..8a913f7735 100644
--- a/packages/component/src/components/page-list/styles.ts
+++ b/packages/component/src/components/page-list/styles.ts
@@ -7,7 +7,6 @@ export const StyledTableContainer = styled('div')(({ theme }) => {
     height: '100%',
     padding: '0 32px 180px 32px',
     maxWidth: '100%',
-    overflowY: 'scroll',
     [theme.breakpoints.down('sm')]: {
       padding: '52px 0px',
       'tr > td:first-of-type': {
diff --git a/packages/component/src/index.ts b/packages/component/src/index.ts
index 2031c16b8c..89553d897a 100644
--- a/packages/component/src/index.ts
+++ b/packages/component/src/index.ts
@@ -10,6 +10,7 @@ export * from './ui/menu';
 export * from './ui/modal';
 export * from './ui/mui';
 export * from './ui/popper';
+export * from './ui/scrollbar';
 export * from './ui/shared/container';
 export * from './ui/switch';
 export * from './ui/table';
diff --git a/packages/component/src/theme/global.css b/packages/component/src/theme/global.css
index 51d5223504..44ff34ada3 100644
--- a/packages/component/src/theme/global.css
+++ b/packages/component/src/theme/global.css
@@ -187,14 +187,24 @@ input[type='number']::-webkit-outer-spin-button {
   -ms-overflow-style: none; /* IE 10+ */
 }
 ::-webkit-scrollbar {
-  display: none; /* Chrome Safari */
+  width: 0; /* Chrome Safari */
+  height: 0;
 }
-
+.affine-default-viewport::-webkit-scrollbar {
+  width: 8px; /* Chrome Safari */
+}
+.affine-default-viewport::-webkit-scrollbar-thumb {
+  border-radius: 4px;
+}
+.affine-default-viewport:hover::-webkit-scrollbar-thumb {
+  background-color: var(--affine-black-30);
+ }
 .editor-wrapper {
   position: relative;
   width: 100%;
   height: 100%;
-  padding: 0 2rem;
+  padding: 0 1rem;
+  padding-right: 8px;
 }
 
 /* issue: https://github.com/toeverything/AFFiNE/issues/2004 */
diff --git a/packages/component/src/ui/button/styles.css.ts b/packages/component/src/ui/button/styles.css.ts
index e779d13e96..711a4db41f 100644
--- a/packages/component/src/ui/button/styles.css.ts
+++ b/packages/component/src/ui/button/styles.css.ts
@@ -28,7 +28,7 @@ export const dropdownBtn = style({
 export const divider = style({
   width: '0.5px',
   height: '16px',
-  background: 'var(--affine-border-color)',
+  background: 'var(--affine-divider-color)',
   // fix dropdown button click area
   margin: '0 4px',
   marginRight: 0,
diff --git a/packages/component/src/ui/scrollbar/index.css.ts b/packages/component/src/ui/scrollbar/index.css.ts
new file mode 100644
index 0000000000..0e11e3652a
--- /dev/null
+++ b/packages/component/src/ui/scrollbar/index.css.ts
@@ -0,0 +1,85 @@
+import { globalStyle, style } from '@vanilla-extract/css';
+
+
+
+export const scrollableContainerRoot = style({
+  width: '100%',
+  vars: {
+    '--scrollbar-width': '10px',
+  },
+  height: '100%',
+
+});
+
+export const scrollTopBorder = style({
+  position: 'absolute',
+  top: 0,
+  left: '16px',
+  right: '16px',
+  height: '1px',
+  transition: 'opacity .3s .2s',
+  opacity: 0,
+  background: 'var(--affine-border-color)',
+  selectors: {
+    '&[data-has-scroll-top="true"]': {
+      opacity: 1,
+    },
+  },
+});
+
+export const scrollableViewport = style({
+  height: '100%',
+  width: '100%',
+});
+
+
+globalStyle(`${scrollableViewport} > div`, {
+  maxWidth: '100%',
+  display: 'block !important',
+});
+
+export const scrollableContainer = style({
+  height: '100%',
+  marginBottom: '4px',
+});
+
+export const scrollbar = style({
+  display: 'flex',
+  flexDirection: 'column',
+  userSelect: 'none',
+  touchAction: 'none',
+  padding: '0 2px',
+  marginRight: '4px',
+  width: 'var(--scrollbar-width)',
+  height: '100%',
+  opacity: 1,
+  transition: 'opacity .15s',
+  selectors: {
+    '&[data-state="hidden"]': {
+      opacity: 0,
+    },
+  },
+});
+export const TableScrollbar = style({
+  paddingTop: '60px',
+  paddingBottom: '60px',
+});
+
+export const scrollbarThumb = style({
+  position: 'relative',
+  background: 'var(--affine-black-30)',
+  borderRadius: '4px',
+  selectors: {
+    '&::before': {
+      content: '""',
+      position: 'absolute',
+      top: '50%',
+      left: '50%',
+      transform: 'translate(-50%, -50%)',
+      width: '100%',
+      height: '100%',
+      minWidth: '44px',
+      minHeight: '44px',
+    },
+  },
+});
diff --git a/packages/component/src/ui/scrollbar/index.ts b/packages/component/src/ui/scrollbar/index.ts
new file mode 100644
index 0000000000..23f4b9f5a8
--- /dev/null
+++ b/packages/component/src/ui/scrollbar/index.ts
@@ -0,0 +1 @@
+export * from './scrollbar';
\ No newline at end of file
diff --git a/packages/component/src/ui/scrollbar/scrollbar.tsx b/packages/component/src/ui/scrollbar/scrollbar.tsx
new file mode 100644
index 0000000000..1c804a9bb0
--- /dev/null
+++ b/packages/component/src/ui/scrollbar/scrollbar.tsx
@@ -0,0 +1,43 @@
+import * as ScrollArea from '@radix-ui/react-scroll-area';
+import clsx from 'clsx';
+import { type PropsWithChildren } from 'react';
+
+import { useHasScrollTop } from '../../components/app-sidebar/sidebar-containers/use-has-scroll-top';
+import * as styles from './index.css';
+
+export type ScrollableContainerProps = {
+  showScrollTopBorder?: boolean;
+  inTableView?: boolean;
+};
+
+export const ScrollableContainer = ({
+  children,
+  showScrollTopBorder = false,
+  inTableView = false,
+}: PropsWithChildren<ScrollableContainerProps>) => {
+    const [hasScrollTop, ref] = useHasScrollTop();
+    return (
+      <ScrollArea.Root className={styles.scrollableContainerRoot}>
+        <div
+          data-has-scroll-top={hasScrollTop}
+          className={clsx({[styles.scrollTopBorder]:showScrollTopBorder})}
+        />
+        <ScrollArea.Viewport
+          className={clsx([styles.scrollableViewport])}
+          ref={ref}
+        >
+          <div className={styles.scrollableContainer}>
+          {children}
+          </div>
+         
+        </ScrollArea.Viewport>
+        <ScrollArea.Scrollbar
+          
+          orientation="vertical"
+          className={clsx(styles.scrollbar,{[styles.TableScrollbar]:inTableView})}
+        >
+          <ScrollArea.Thumb className={styles.scrollbarThumb} />
+        </ScrollArea.Scrollbar>
+      </ScrollArea.Root>
+    );
+  }