diff --git a/src/X1.WebUI/src/components/layout/Content.tsx b/src/X1.WebUI/src/components/layout/Content.tsx
index 9e1662c..2d07632 100644
--- a/src/X1.WebUI/src/components/layout/Content.tsx
+++ b/src/X1.WebUI/src/components/layout/Content.tsx
@@ -10,8 +10,8 @@ export function Content({ children }: ContentProps) {
   const { isCollapsed } = useSidebarToggle();
 
   return (
-    <main className="flex-1 p-0 transition-all duration-300 ease-in-out">
-      <div className="w-full">
+    <main className="flex-1 min-h-0 overflow-y-auto p-0 transition-all duration-300 ease-in-out">
+      <div className="w-full min-h-0">
         {children}
       </div>
     </main>
diff --git a/src/X1.WebUI/src/components/layout/DashboardLayout.tsx b/src/X1.WebUI/src/components/layout/DashboardLayout.tsx
index 34a0e97..3346278 100644
--- a/src/X1.WebUI/src/components/layout/DashboardLayout.tsx
+++ b/src/X1.WebUI/src/components/layout/DashboardLayout.tsx
@@ -16,9 +16,9 @@ export function DashboardLayout({ children }: DashboardLayoutProps) {
   return (
     <div className="h-screen flex flex-col">
       <Header />
-      <div className="flex flex-1">
+      <div className="flex flex-1 min-h-0">
         <Sidebar />
-        <div className="flex-1 flex flex-col transition-all duration-300 ease-in-out">
+        <div className="flex-1 flex flex-col min-h-0">
           <Tabs />
           <Content>
             {children}
diff --git a/src/X1.WebUI/src/components/layout/Sidebar.tsx b/src/X1.WebUI/src/components/layout/Sidebar.tsx
index 9630789..4ddf8ba 100644
--- a/src/X1.WebUI/src/components/layout/Sidebar.tsx
+++ b/src/X1.WebUI/src/components/layout/Sidebar.tsx
@@ -37,7 +37,7 @@ export function Sidebar() {
         isCollapsed ? 'w-14' : 'w-64'
       )}
     >
-      <nav className="flex-1 mt-4 space-y-1 px-2 overflow-auto">
+      <nav className="flex-1 mt-4 space-y-1 px-2 overflow-y-auto">
         {filteredMenuItems.map((item) => (
           <SidebarMenuItem
             key={item.href}
diff --git a/src/X1.WebUI/src/index.css b/src/X1.WebUI/src/index.css
index eb6da6d..303c15c 100644
--- a/src/X1.WebUI/src/index.css
+++ b/src/X1.WebUI/src/index.css
@@ -73,4 +73,30 @@
   body {
     @apply bg-background text-foreground;
   }
+}
+
+/* 优化所有滚动条样式 */
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: rgba(0,0,0,0.15);
+  border-radius: 8px;
+  transition: background 0.2s;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: rgba(0,0,0,0.25);
+}
+
+::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+/* Firefox 支持 */
+* {
+  scrollbar-width: thin;
+  scrollbar-color: rgba(0,0,0,0.15) transparent;
 } 
\ No newline at end of file