diff --git a/axelor-web/src/main/webapp/js/widget/widget.slickgrid.js b/axelor-web/src/main/webapp/js/widget/widget.slickgrid.js
index 87ace4eb3f..16856de680 100644
--- a/axelor-web/src/main/webapp/js/widget/widget.slickgrid.js
+++ b/axelor-web/src/main/webapp/js/widget/widget.slickgrid.js
@@ -2323,9 +2323,11 @@ function commitEdit(noWait) {
 
     // Force fetch if pop-up form view is opened.
     // This is needed if form view has fields no present in grid view.
+    data.beginUpdate();
     _.forEach(data.getItems(), function(item) {
       data.updateItem(item.id, _.extend(item || {}, { $fetched: false }));
     });
+    data.endUpdate();
   }
 
   this._commitPromise = promise;
diff --git a/changelogs/unreleased/fix_grid_inline_edit_freeze.yml b/changelogs/unreleased/fix_grid_inline_edit_freeze.yml
new file mode 100644
index 0000000000..90b989a0da
--- /dev/null
+++ b/changelogs/unreleased/fix_grid_inline_edit_freeze.yml
@@ -0,0 +1,3 @@
+---
+title: Fix performance issues during grid inline editing
+type: fix