diff --git a/frontend/src/components/ClusterSelector.js b/frontend/src/components/ClusterSelector.js
index 12c7a81..661036a 100644
--- a/frontend/src/components/ClusterSelector.js
+++ b/frontend/src/components/ClusterSelector.js
@@ -87,6 +87,7 @@ const ClusterSelector = () => {
       <CloudServerOutlined style={{ color: '#1890ff', flexShrink: 0 }} />
       <Select
         value={selectedCluster?.id}
+        showSearch
         style={{ 
           width: getSelectWidth(),
           minWidth: 180, 
@@ -99,6 +100,18 @@ const ClusterSelector = () => {
             selectCluster(cluster);
           }
         }}
+        filterOption={(input, option) => {
+          if (!input) return true;
+          const cluster = clusters.find(c => c.id === option?.value);
+          if (!cluster) return false;
+          const search = input.toLowerCase();
+          return (
+            (cluster.name || '').toLowerCase().includes(search) ||
+            (cluster.pool_name || '').toLowerCase().includes(search) ||
+            (cluster.connection_type || '').toLowerCase().includes(search) ||
+            (cluster.description || '').toLowerCase().includes(search)
+          );
+        }}
         optionLabelProp="label"
         size="middle"
       >