diff --git a/package.json b/package.json
index 4a61e7508..17f7cd6a0 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "build": "npm run typecheck && electron-vite build --outDir=dist && electron-forge make",
     "build:web": "vite build",
     "dev": "electron-vite dev --outDir=dist",
+    "dev:web": "vite",
     "lint": "eslint",
     "lint:fix": "eslint --fix",
     "prepare": "pnpm exec simple-git-hooks && test -f .env || cp .env.example .env",
diff --git a/src/renderer/src/components/ui/scroll-area/ScrollArea.tsx b/src/renderer/src/components/ui/scroll-area/ScrollArea.tsx
index 3a7c12513..cfdb92402 100644
--- a/src/renderer/src/components/ui/scroll-area/ScrollArea.tsx
+++ b/src/renderer/src/components/ui/scroll-area/ScrollArea.tsx
@@ -3,7 +3,7 @@ import { stopPropagation } from "@renderer/lib/dom"
 import { cn } from "@renderer/lib/utils"
 import * as React from "react"
 
-import { useMaskScrollArea } from "./useMaskScrollArea"
+import styles from "./index.module.css"
 
 const Corner = React.forwardRef<
   React.ElementRef<typeof ScrollAreaBase.Corner>,
@@ -66,16 +66,13 @@ export const Viewport = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof ScrollAreaBase.Viewport>
 >(({ className, ...rest }, forwardedRef) => {
   const ref = React.useRef<HTMLDivElement>(null)
-  const [, maskClassName] = useMaskScrollArea({
-    ref,
-    size: "lg",
-  })
+
   React.useImperativeHandle(forwardedRef, () => ref.current as HTMLDivElement)
   return (
     <ScrollAreaBase.Viewport
       {...rest}
       ref={ref}
-      className={cn("block size-full", maskClassName, className)}
+      className={cn("block size-full", styles["scroller"], className)}
     />
   )
 })
diff --git a/src/renderer/src/components/ui/scroll-area/index.module.css b/src/renderer/src/components/ui/scroll-area/index.module.css
new file mode 100644
index 000000000..e3a452291
--- /dev/null
+++ b/src/renderer/src/components/ui/scroll-area/index.module.css
@@ -0,0 +1,33 @@
+.scroller {
+  --mask-size: 48px;
+  padding: 0;
+  background: transparent;
+  mask: linear-gradient(white, transparent) 50% 0 / 100% 0 no-repeat,
+    linear-gradient(white, white) 50% 50% / 100% 100% no-repeat,
+    linear-gradient(transparent, white) 50% 100% / 100% 100px no-repeat;
+  mask-composite: exclude;
+  mask-size: 100% calc((var(--scroll-progress-top) / 100) * 100px), 100% 100%,
+    100% calc((100 - (100 * (var(--scroll-progress-bottom) / 100))) * 1px);
+}
+
+@supports (animation-timeline: scroll()) {
+  .scroller {
+    mask: linear-gradient(white, transparent) 50% 0 / 100% 0 no-repeat,
+      linear-gradient(white, white) 50% 50% / 100% 100% no-repeat,
+      linear-gradient(transparent, white) 50% 100% / 100% 100px no-repeat;
+    mask-composite: exclude;
+    animation: mask-up both linear, mask-down both linear;
+    animation-timeline: scroll(self);
+    animation-range: 0 2rem, calc(100% - 2rem) 100%;
+  }
+}
+@keyframes mask-up {
+  100% {
+    mask-size: 100% 100px, 100% 100%, 100% 100px;
+  }
+}
+@keyframes mask-down {
+  100% {
+    mask-size: 100% 100px, 100% 100%, 100% 0;
+  }
+}
diff --git a/src/renderer/src/modules/search/cmdk.tsx b/src/renderer/src/modules/search/cmdk.tsx
index c3c1c90fa..128e0d537 100644
--- a/src/renderer/src/modules/search/cmdk.tsx
+++ b/src/renderer/src/modules/search/cmdk.tsx
@@ -149,8 +149,9 @@ export const SearchCmdK: React.FC = () => {
 
         <ScrollArea.ScrollArea
           ref={scrollViewRef}
-          viewportClassName="max-h-[50vh] px-5 [&>div]:!flex"
-          rootClassName="h-full"
+          viewportClassName="max-h-[50vh] [&>div]:!flex"
+          rootClassName="h-full px-5"
+          scrollbarClassName="mb-6"
         >
           <Command.List className="flex w-full min-w-0 flex-col">
             <SearchPlaceholder />
diff --git a/vite.config.ts b/vite.config.ts
index d17262d3a..863d6eecb 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -15,6 +15,7 @@ export default defineConfig({
     sourcemap: true,
   },
   root: "./src/renderer",
+  envDir: resolve(__dirname, "."),
   resolve: {
     alias: {
       "@renderer": resolve("src/renderer/src"),