diff --git a/src/frontend/devops-repository/src/store/actions/repoGeneric.js b/src/frontend/devops-repository/src/store/actions/repoGeneric.js
index debad7e1c4..bc3c58bd4d 100644
--- a/src/frontend/devops-repository/src/store/actions/repoGeneric.js
+++ b/src/frontend/devops-repository/src/store/actions/repoGeneric.js
@@ -133,7 +133,7 @@ export default {
         if (isPipeline && !fullPath && !name && localRepo) {
             return Vue.prototype.$ajax.get(
                 `${prefix}/pipeline/list/${projectId}`
-            ).then(records => ({ records, totalRecords: 0 }))
+            ).then(records => ({ records, totalRecords: records.length }))
         } else {
             return Vue.prototype.$ajax.post(
                 localRepo ? `${prefix}/node/search` : `generic/${projectId}/${repoName}/search`,
diff --git a/src/frontend/devops-repository/src/views/repoGeneric/genericFormDialog.vue b/src/frontend/devops-repository/src/views/repoGeneric/genericFormDialog.vue
index 6c99cd66eb..52588bef3d 100644
--- a/src/frontend/devops-repository/src/views/repoGeneric/genericFormDialog.vue
+++ b/src/frontend/devops-repository/src/views/repoGeneric/genericFormDialog.vue
@@ -291,6 +291,7 @@
                 }
                 fn.then(() => {
                     this.$emit('refresh')
+                    this.$emit('cancelSelect')
                     if (!this.webError) {
                         this.$bkMessage({
                             theme: 'success',
diff --git a/src/frontend/devops-repository/src/views/repoGeneric/index.vue b/src/frontend/devops-repository/src/views/repoGeneric/index.vue
index 0dc89f0f6c..e1c9444eab 100644
--- a/src/frontend/devops-repository/src/views/repoGeneric/index.vue
+++ b/src/frontend/devops-repository/src/views/repoGeneric/index.vue
@@ -221,7 +221,7 @@
 
         <generic-clean-dialog ref="genericCleanDialog" @refresh="refreshNodeChange"></generic-clean-dialog>
         <generic-detail ref="genericDetail"></generic-detail>
-        <generic-form-dialog ref="genericFormDialog" @refresh="refreshNodeChange"></generic-form-dialog>
+        <generic-form-dialog ref="genericFormDialog" @refresh="refreshNodeChange" @cancelSelect="cancelSelect"></generic-form-dialog>
         <generic-share-dialog ref="genericShareDialog"></generic-share-dialog>
         <generic-tree-dialog ref="genericTreeDialog" @update="updateGenericTreeNode" @refresh="refreshNodeChange"></generic-tree-dialog>
         <preview-basic-file-dialog ref="previewBasicFileDialog"></preview-basic-file-dialog>
@@ -925,6 +925,7 @@
                             fullPath
                         }).then(res => {
                             this.refreshNodeChange()
+                            this.cancelSelect()
                             if (folder) {
                                 if (totalRecords === res.deletedNumber) {
                                     this.$bkMessage({