diff --git a/internal/services/env_service.go b/internal/services/env_service.go
index ebb91ce..22444a9 100644
--- a/internal/services/env_service.go
+++ b/internal/services/env_service.go
@@ -58,7 +58,7 @@ func (es *EnvService) GetEnvVarsWithPagination(userID string, name string, envTy
 
 	query := database.DB.Model(&models.EnvironmentVariable{}).Where("user_id = ?", userID)
 	if name != "" {
-		query = query.Where("name LIKE ?", "%"+name+"%")
+		query = query.Where("name LIKE ? OR remark LIKE ?", "%"+name+"%", "%"+name+"%")
 	}
 	if envType != "" {
 		query = query.Where("type = ?", envType)
diff --git a/internal/services/tasks/task_service.go b/internal/services/tasks/task_service.go
index df1c750..75a7f78 100644
--- a/internal/services/tasks/task_service.go
+++ b/internal/services/tasks/task_service.go
@@ -72,7 +72,7 @@ func (ts *TaskService) GetTasksWithPagination(page, pageSize int, name string, a
 
 	query := database.DB.Model(&models.Task{})
 	if name != "" {
-		query = query.Where("name LIKE ?", "%"+name+"%")
+		query = query.Where("name LIKE ? OR remark LIKE ?", "%"+name+"%", "%"+name+"%")
 	}
 	if tags != "" {
 		query = query.Where("tags LIKE ?", "%"+tags+"%")
diff --git a/web/src/views/tasks/TaskDialog.vue b/web/src/views/tasks/TaskDialog.vue
index 58aeb86..6bcc653 100644
--- a/web/src/views/tasks/TaskDialog.vue
+++ b/web/src/views/tasks/TaskDialog.vue
@@ -108,7 +108,10 @@ const cleanConfig = computed(() => {
 
 const filteredEnvVars = computed(() => {
   return allEnvVars.value.filter((env: EnvVar) => {
-    const matchSearch = !envSearchQuery.value || env.name.toLowerCase().includes(envSearchQuery.value.toLowerCase())
+    const q = envSearchQuery.value.toLowerCase()
+    const matchSearch = !q || 
+      env.name.toLowerCase().includes(q) || 
+      (env.remark && env.remark.toLowerCase().includes(q))
     const notSelected = !selectedEnvIds.value.includes(env.id)
     return matchSearch && notSelected
   })