diff --git a/packages/nc-gui/components/ProjectTreeView.vue b/packages/nc-gui/components/ProjectTreeView.vue
index f53a8d887b..60ff5333b2 100644
--- a/packages/nc-gui/components/ProjectTreeView.vue
+++ b/packages/nc-gui/components/ProjectTreeView.vue
@@ -27,6 +27,7 @@
 
                 </v-btn>-->
           <v-text-field
+            v-else
             v-model="search"
             placeholder="Search tables"
             dense
diff --git a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue
index 556d200977..0f761313f0 100644
--- a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue
+++ b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue
@@ -933,15 +933,18 @@ export default {
       if (!this.data[row]) {
         return
       }
-      const { row: rowObj, rowMeta, oldRow } = this.data[row]
+      const { row: rowObj, rowMeta, oldRow, saving } = this.data[row]
       if (rowMeta.new) {
+        // return if there is no change
+        if (oldRow[column._cn] === rowObj[column._cn] || saving) {
+          return
+        }
         await this.save()
       } else {
         try {
           if (!this.api) {
             return
           }
-
           // return if there is no change
           if (oldRow[column._cn] === rowObj[column._cn]) {
             return
@@ -953,7 +956,7 @@ export default {
             return this.$toast.info('Update not allowed for table which doesn\'t have primary Key').goAway(3000)
           }
           this.$set(this.data[row], 'saving', true)
-
+          // eslint-disable-next-line promise/param-names
           const newData = await this.api.update(id, {
             [column._cn]: rowObj[column._cn]
           }, { [column._cn]: oldRow[column._cn] })
diff --git a/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue b/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue
index 8fcea5190f..905dc54366 100644
--- a/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue
+++ b/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue
@@ -194,7 +194,6 @@
               @save="editEnabled = {}"
               @cancel="editEnabled = {}"
               @update="onCellValueChange(col, row, columnObj)"
-              @blur="onCellValueChange(col, row, columnObj,'blur')"
               @change="onCellValueChange(col, row, columnObj)"
             />
 
@@ -486,6 +485,8 @@ export default {
       }
       this.selected.col = null
       this.selected.row = null
+      this.editEnabled.col = null
+      this.editEnabled.row = null
     },
     onNewColCreation(col, oldCol) {
       this.addNewColMenu = false