diff --git a/internal/web/actions/default/clusters/selectPopup.go b/internal/web/actions/default/clusters/selectPopup.go
index f33a9e84..03d034df 100644
--- a/internal/web/actions/default/clusters/selectPopup.go
+++ b/internal/web/actions/default/clusters/selectPopup.go
@@ -35,11 +35,11 @@ func (this *SelectPopupAction) RunGet(params struct {
 		return
 	}
 	var count = countResp.Count
-	var page = this.NewPage(count)
-	page.Size = 6
+	var pageSize int64 = 6
 	if params.PageSize > 0 {
-		page.Size = params.PageSize
+		pageSize = params.PageSize
 	}
+	var page = this.NewPage(count, pageSize)
 	this.Data["page"] = page.AsHTML()
 
 	clustersResp, err := this.RPC().NodeClusterRPC().ListEnabledNodeClusters(this.AdminContext(), &pb.ListEnabledNodeClustersRequest{
diff --git a/web/views/@default/clusters/selectPopup.html b/web/views/@default/clusters/selectPopup.html
index 017dc109..3b0b6a06 100644
--- a/web/views/@default/clusters/selectPopup.html
+++ b/web/views/@default/clusters/selectPopup.html
@@ -24,7 +24,9 @@
         </tr>
     </thead>
     <tr v-for="cluster in clusters">
-        <td>{{cluster.name}}</td>
+        <td>
+            <keyword :v-word="keyword">{{cluster.name}}</keyword>
+        </td>
         <td>{{cluster.countNodes}}</td>
         <td><label-on :v-is-on="cluster.isOn"></label-on></td>
         <td>