diff --git a/apps/desktop/src/components/MaterialSegmentView.tsx b/apps/desktop/src/components/MaterialSegmentView.tsx
index f356a52..484b39f 100644
--- a/apps/desktop/src/components/MaterialSegmentView.tsx
+++ b/apps/desktop/src/components/MaterialSegmentView.tsx
@@ -92,7 +92,6 @@ export const MaterialSegmentView: React.FC<MaterialSegmentViewProps> = ({ projec
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [searchTerm, setSearchTerm] = useState('');
-  const [activeTab, setActiveTab] = useState<'classification' | 'model'>('classification');
   const [selectedClassification, setSelectedClassification] = useState<string>('全部');
   const [selectedModel, setSelectedModel] = useState<string>('全部');
 
@@ -175,40 +174,30 @@ export const MaterialSegmentView: React.FC<MaterialSegmentViewProps> = ({ projec
   const filteredSegments = useMemo(() => {
     if (!segmentView) return [];
 
+    // 获取所有片段
     let segments: SegmentWithDetails[] = [];
+    segmentView.by_classification.forEach(group => {
+      segments.push(...group.segments);
+    });
 
-    if (activeTab === 'classification') {
-      if (selectedClassification === '全部') {
-        // 获取所有片段
-        segmentView.by_classification.forEach(group => {
-          segments.push(...group.segments);
-        });
-      } else {
-        // 获取特定分类的片段
-        const group = segmentView.by_classification.find(g => g.category === selectedClassification);
-        if (group) {
-          segments = group.segments;
-        }
-      }
-    } else {
-      if (selectedModel === '全部') {
-        // 获取所有片段
-        segmentView.by_model.forEach(group => {
-          segments.push(...group.segments);
-        });
-      } else {
-        // 获取特定模特的片段
-        const group = segmentView.by_model.find(g => g.model_name === selectedModel);
-        if (group) {
-          segments = group.segments;
-        }
-      }
+    // 应用分类过滤
+    if (selectedClassification !== '全部') {
+      segments = segments.filter(segment =>
+        segment.classification_info?.category === selectedClassification
+      );
+    }
+
+    // 应用模特过滤
+    if (selectedModel !== '全部') {
+      segments = segments.filter(segment =>
+        segment.model_info?.name === selectedModel
+      );
     }
 
     // 应用搜索过滤
     if (searchTerm.trim()) {
       const searchLower = searchTerm.toLowerCase();
-      segments = segments.filter(segment => 
+      segments = segments.filter(segment =>
         segment.material_info.name.toLowerCase().includes(searchLower) ||
         segment.classification_info?.category?.toLowerCase().includes(searchLower) ||
         segment.model_info?.name?.toLowerCase().includes(searchLower)
@@ -216,7 +205,7 @@ export const MaterialSegmentView: React.FC<MaterialSegmentViewProps> = ({ projec
     }
 
     return segments;
-  }, [segmentView, activeTab, selectedClassification, selectedModel, searchTerm]);
+  }, [segmentView, selectedClassification, selectedModel, searchTerm]);
 
   // 渲染片段卡片
   const renderSegmentCard = (segment: SegmentWithDetails) => {
@@ -354,74 +343,88 @@ export const MaterialSegmentView: React.FC<MaterialSegmentViewProps> = ({ projec
         </InteractiveButton>
       </div>
 
-      {/* 标签页导航 */}
-      <div className="border-b border-gray-200">
-        <nav className="flex space-x-8">
-          <button
-            onClick={() => setActiveTab('classification')}
-            className={`py-2 px-1 border-b-2 font-medium text-sm transition-colors ${
-              activeTab === 'classification'
-                ? 'border-primary-500 text-primary-600'
-                : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'
-            }`}
-          >
-            <div className="flex items-center gap-2">
-              <Tag size={16} />
-              <span>AI分类</span>
-            </div>
-          </button>
-          <button
-            onClick={() => setActiveTab('model')}
-            className={`py-2 px-1 border-b-2 font-medium text-sm transition-colors ${
-              activeTab === 'model'
-                ? 'border-primary-500 text-primary-600'
-                : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'
-            }`}
-          >
-            <div className="flex items-center gap-2">
-              <Users size={16} />
-              <span>模特</span>
-            </div>
-          </button>
-        </nav>
-      </div>
+      {/* 筛选条件 */}
+      <div className="space-y-4">
+        {/* AI分类筛选 */}
+        <div>
+          <div className="flex items-center gap-2 mb-3">
+            <Tag size={16} className="text-gray-600" />
+            <span className="text-sm font-medium text-gray-700">AI分类</span>
+          </div>
+          <div className="flex flex-wrap gap-2">
+            {classificationOptions.map(option => (
+              <button
+                key={option.value}
+                onClick={() => setSelectedClassification(option.value)}
+                className={`inline-flex items-center px-3 py-1.5 rounded-full text-sm font-medium transition-colors ${
+                  selectedClassification === option.value
+                    ? 'bg-blue-100 text-blue-800 border border-blue-200'
+                    : 'bg-gray-100 text-gray-700 hover:bg-gray-200 border border-gray-200'
+                }`}
+              >
+                <span>{option.label}</span>
+                <span className="ml-1.5 px-1.5 py-0.5 bg-white rounded-full text-xs">
+                  {option.count}
+                </span>
+              </button>
+            ))}
+          </div>
+        </div>
 
-      {/* 过滤选项 */}
-      <div className="flex flex-wrap gap-2">
-        {activeTab === 'classification' ? (
-          classificationOptions.map(option => (
-            <button
-              key={option.value}
-              onClick={() => setSelectedClassification(option.value)}
-              className={`inline-flex items-center px-3 py-1.5 rounded-full text-sm font-medium transition-colors ${
-                selectedClassification === option.value
-                  ? 'bg-primary-100 text-primary-800 border border-primary-200'
-                  : 'bg-gray-100 text-gray-700 hover:bg-gray-200 border border-gray-200'
-              }`}
-            >
-              <span>{option.label}</span>
-              <span className="ml-1.5 px-1.5 py-0.5 bg-white rounded-full text-xs">
-                {option.count}
+        {/* 模特筛选 */}
+        <div>
+          <div className="flex items-center gap-2 mb-3">
+            <Users size={16} className="text-gray-600" />
+            <span className="text-sm font-medium text-gray-700">模特</span>
+          </div>
+          <div className="flex flex-wrap gap-2">
+            {modelOptions.map(option => (
+              <button
+                key={option.value}
+                onClick={() => setSelectedModel(option.value)}
+                className={`inline-flex items-center px-3 py-1.5 rounded-full text-sm font-medium transition-colors ${
+                  selectedModel === option.value
+                    ? 'bg-green-100 text-green-800 border border-green-200'
+                    : 'bg-gray-100 text-gray-700 hover:bg-gray-200 border border-gray-200'
+                }`}
+              >
+                <span>{option.label}</span>
+                <span className="ml-1.5 px-1.5 py-0.5 bg-white rounded-full text-xs">
+                  {option.count}
+                </span>
+              </button>
+            ))}
+          </div>
+        </div>
+
+        {/* 当前筛选条件显示 */}
+        {(selectedClassification !== '全部' || selectedModel !== '全部') && (
+          <div className="flex items-center gap-2 p-3 bg-gray-50 rounded-lg">
+            <Filter size={16} className="text-gray-500" />
+            <span className="text-sm text-gray-600">当前筛选：</span>
+            {selectedClassification !== '全部' && (
+              <span className="inline-flex items-center px-2 py-1 bg-blue-100 text-blue-800 text-xs rounded-full">
+                AI分类: {selectedClassification}
               </span>
-            </button>
-          ))
-        ) : (
-          modelOptions.map(option => (
-            <button
-              key={option.value}
-              onClick={() => setSelectedModel(option.value)}
-              className={`inline-flex items-center px-3 py-1.5 rounded-full text-sm font-medium transition-colors ${
-                selectedModel === option.value
-                  ? 'bg-primary-100 text-primary-800 border border-primary-200'
-                  : 'bg-gray-100 text-gray-700 hover:bg-gray-200 border border-gray-200'
-              }`}
-            >
-              <span>{option.label}</span>
-              <span className="ml-1.5 px-1.5 py-0.5 bg-white rounded-full text-xs">
-                {option.count}
+            )}
+            {selectedClassification !== '全部' && selectedModel !== '全部' && (
+              <span className="text-xs text-gray-500">AND</span>
+            )}
+            {selectedModel !== '全部' && (
+              <span className="inline-flex items-center px-2 py-1 bg-green-100 text-green-800 text-xs rounded-full">
+                模特: {selectedModel}
               </span>
+            )}
+            <button
+              onClick={() => {
+                setSelectedClassification('全部');
+                setSelectedModel('全部');
+              }}
+              className="ml-auto text-xs text-gray-500 hover:text-gray-700"
+            >
+              清除筛选
             </button>
-          ))
+          </div>
         )}
       </div>