diff --git a/apps/desktop/src/App.tsx b/apps/desktop/src/App.tsx
index 0df17fa..766d1e8 100644
--- a/apps/desktop/src/App.tsx
+++ b/apps/desktop/src/App.tsx
@@ -62,20 +62,22 @@ function App() {
 
   return (
     <Router>
-      <div className="min-h-screen bg-gradient-to-br from-gray-50 via-white to-gray-50">
-        {/* 导航栏 */}
+      <div className="h-screen flex flex-col bg-gradient-to-br from-gray-50 via-white to-gray-50">
+        {/* 固定的导航栏 */}
         <Navigation />
 
-        {/* 主要内容区域 */}
-        <main className="container mx-auto px-4 sm:px-6 lg:px-8 py-4 sm:py-6 lg:py-8 max-w-7xl">
-          <Routes>
-            <Route path="/" element={<ProjectList />} />
-            <Route path="/project/:id" element={<ProjectDetails />} />
-            <Route path="/models" element={<Models />} />
-            <Route path="/ai-classification-settings" element={<AiClassificationSettings />} />
-            <Route path="/templates" element={<TemplateManagement />} />
-            <Route path="/material-model-binding" element={<MaterialModelBinding />} />
-          </Routes>
+        {/* 可滚动的主要内容区域 */}
+        <main className="flex-1 overflow-y-auto smooth-scroll">
+          <div className="container mx-auto px-4 sm:px-6 lg:px-8 py-4 sm:py-6 lg:py-8 max-w-7xl min-h-full">
+            <Routes>
+              <Route path="/" element={<ProjectList />} />
+              <Route path="/project/:id" element={<ProjectDetails />} />
+              <Route path="/models" element={<Models />} />
+              <Route path="/ai-classification-settings" element={<AiClassificationSettings />} />
+              <Route path="/templates" element={<TemplateManagement />} />
+              <Route path="/material-model-binding" element={<MaterialModelBinding />} />
+            </Routes>
+          </div>
         </main>
 
         {/* 创建项目模态框 */}
diff --git a/apps/desktop/src/components/ModelList.tsx b/apps/desktop/src/components/ModelList.tsx
index cd22fb9..c1fbcbd 100644
--- a/apps/desktop/src/components/ModelList.tsx
+++ b/apps/desktop/src/components/ModelList.tsx
@@ -346,9 +346,10 @@ const ModelList: React.FC<ModelListProps> = ({ onModelSelect }) => {
           />
         </div>
 
-        {/* 模特列表 */}
-        {filteredModels.length === 0 ? (
-          <div className="text-center py-16 animate-fade-in">
+        {/* 模特列表 - 优化滚动 */}
+        <div className="max-h-[calc(100vh-16rem)] overflow-y-auto custom-scrollbar">
+          {filteredModels.length === 0 ? (
+            <div className="text-center py-16 animate-fade-in">
             <div className="max-w-md mx-auto">
               <div className="w-16 h-16 bg-gray-100 rounded-full flex items-center justify-center mx-auto mb-4">
                 <MagnifyingGlassIcon className="h-8 w-8 text-gray-400" />
@@ -396,7 +397,7 @@ const ModelList: React.FC<ModelListProps> = ({ onModelSelect }) => {
             ))}
           </div>
         )}
-
+        </div>
 
       </div>
 
diff --git a/apps/desktop/src/components/Navigation.tsx b/apps/desktop/src/components/Navigation.tsx
index e9b29bc..945b573 100644
--- a/apps/desktop/src/components/Navigation.tsx
+++ b/apps/desktop/src/components/Navigation.tsx
@@ -52,7 +52,7 @@ const Navigation: React.FC = () => {
   };
 
   return (
-    <nav className="bg-white/95 backdrop-blur-sm shadow-sm border-b border-gray-200/50 sticky top-0 z-50">
+    <nav className="bg-white/95 backdrop-blur-sm shadow-sm border-b border-gray-200/50 sticky top-0 z-50 flex-shrink-0">
       <div className="px-4 sm:px-6 lg:px-8">
         <div className="flex items-center justify-between h-16">
           {/* 增强的 Logo */}
diff --git a/apps/desktop/src/pages/AiClassificationSettings.tsx b/apps/desktop/src/pages/AiClassificationSettings.tsx
index de960e8..724eba6 100644
--- a/apps/desktop/src/pages/AiClassificationSettings.tsx
+++ b/apps/desktop/src/pages/AiClassificationSettings.tsx
@@ -336,8 +336,8 @@ const AiClassificationSettings: React.FC = () => {
               </h2>
             </div>
 
-            {/* 美观的分类卡片网格 */}
-            <div className="grid gap-4">
+            {/* 美观的分类卡片网格 - 优化滚动 */}
+            <div className="grid gap-4 max-h-[calc(100vh-16rem)] overflow-y-auto custom-scrollbar">
               {classifications.map((classification, index) => (
                 <div
                   key={classification.id}
diff --git a/apps/desktop/src/pages/ProjectDetails.tsx b/apps/desktop/src/pages/ProjectDetails.tsx
index f4032ea..c3ff2a5 100644
--- a/apps/desktop/src/pages/ProjectDetails.tsx
+++ b/apps/desktop/src/pages/ProjectDetails.tsx
@@ -675,7 +675,7 @@ export const ProjectDetails: React.FC = () => {
           </div>
 
           {/* 选项卡内容 */}
-          <div className="p-4 md:p-6">
+          <div className="p-4 md:p-6 max-h-[calc(100vh-20rem)] overflow-y-auto custom-scrollbar">
             {/* 素材管理选项卡 */}
             {activeTab === 'materials' && (
               <div className="space-y-6">
diff --git a/apps/desktop/src/pages/TemplateManagement.tsx b/apps/desktop/src/pages/TemplateManagement.tsx
index 98600a2..eab017b 100644
--- a/apps/desktop/src/pages/TemplateManagement.tsx
+++ b/apps/desktop/src/pages/TemplateManagement.tsx
@@ -251,13 +251,14 @@ const TemplateManagement: React.FC = () => {
           </div>
         </div>
 
-        {/* 模板列表 */}
-        {loading ? (
-          <div className="flex items-center justify-center py-12">
-            <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-600"></div>
-            <span className="ml-3 text-gray-600">加载中...</span>
-          </div>
-        ) : templates.length === 0 ? (
+        {/* 模板列表 - 优化滚动 */}
+        <div className="max-h-[calc(100vh-16rem)] overflow-y-auto custom-scrollbar">
+          {loading ? (
+            <div className="flex items-center justify-center py-12">
+              <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-600"></div>
+              <span className="ml-3 text-gray-600">加载中...</span>
+            </div>
+          ) : templates.length === 0 ? (
           <div className="text-center py-16">
             <div className="w-20 h-20 bg-gradient-to-br from-gray-100 to-gray-200 rounded-2xl flex items-center justify-center mx-auto mb-6">
               <FileText className="w-10 h-10 text-gray-400" />
@@ -315,6 +316,7 @@ const TemplateManagement: React.FC = () => {
             )}
           </>
         )}
+        </div>
       </div>
 
       {/* 模态框 */}
diff --git a/apps/desktop/src/styles/design-system.css b/apps/desktop/src/styles/design-system.css
index bb6f022..c7af150 100644
--- a/apps/desktop/src/styles/design-system.css
+++ b/apps/desktop/src/styles/design-system.css
@@ -684,3 +684,160 @@
 .modal-z-index.highest {
   z-index: 1200;
 }
+
+/* ===== 全局滚动条优化 ===== */
+
+/* 主内容区域滚动条 */
+main {
+  scrollbar-width: thin;
+  scrollbar-color: rgba(156, 163, 175, 0.3) transparent;
+}
+
+main::-webkit-scrollbar {
+  width: 8px;
+}
+
+main::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+main::-webkit-scrollbar-thumb {
+  background-color: rgba(156, 163, 175, 0.3);
+  border-radius: 4px;
+  transition: background-color 0.2s ease;
+}
+
+main::-webkit-scrollbar-thumb:hover {
+  background-color: rgba(156, 163, 175, 0.5);
+}
+
+/* 通用滚动条样式 */
+.custom-scrollbar {
+  scrollbar-width: thin;
+  scrollbar-color: rgba(156, 163, 175, 0.4) transparent;
+}
+
+.custom-scrollbar::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.custom-scrollbar::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+.custom-scrollbar::-webkit-scrollbar-thumb {
+  background-color: rgba(156, 163, 175, 0.4);
+  border-radius: 3px;
+  transition: background-color 0.2s ease;
+}
+
+.custom-scrollbar::-webkit-scrollbar-thumb:hover {
+  background-color: rgba(156, 163, 175, 0.6);
+}
+
+.custom-scrollbar::-webkit-scrollbar-corner {
+  background: transparent;
+}
+
+/* 隐藏滚动条但保持功能 */
+.scrollbar-hidden {
+  scrollbar-width: none;
+  -ms-overflow-style: none;
+}
+
+.scrollbar-hidden::-webkit-scrollbar {
+  display: none;
+}
+
+/* 平滑滚动 */
+.smooth-scroll {
+  scroll-behavior: smooth;
+}
+
+/* ===== 页面布局优化 ===== */
+
+/* 固定导航栏布局 */
+.app-layout {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.app-header {
+  flex-shrink: 0;
+  position: sticky;
+  top: 0;
+  z-index: 50;
+}
+
+.app-main {
+  flex: 1;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+/* 内容区域优化 */
+.content-container {
+  min-height: 100%;
+  padding: 1rem 1rem 2rem;
+}
+
+@media (min-width: 640px) {
+  .content-container {
+    padding: 1.5rem 1.5rem 3rem;
+  }
+}
+
+@media (min-width: 1024px) {
+  .content-container {
+    padding: 2rem 2rem 4rem;
+  }
+}
+
+/* 滚动区域阴影效果 */
+.scroll-shadow {
+  position: relative;
+}
+
+.scroll-shadow::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 10px;
+  background: linear-gradient(to bottom, rgba(0, 0, 0, 0.1), transparent);
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  pointer-events: none;
+  z-index: 1;
+}
+
+.scroll-shadow.scrolled::before {
+  opacity: 1;
+}
+
+/* 滚动到底部指示器 */
+.scroll-indicator {
+  position: relative;
+}
+
+.scroll-indicator::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 10px;
+  background: linear-gradient(to top, rgba(0, 0, 0, 0.1), transparent);
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  pointer-events: none;
+  z-index: 1;
+}
+
+.scroll-indicator.has-more::after {
+  opacity: 1;
+}