diff --git a/lisp/org.el b/lisp/org.el
index b27dc1b18..c5ea3ebb7 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16489,7 +16489,8 @@ overwritten, and the table is not marked as requiring realignment."
        t)
      (looking-at "[^|\n]*  |"))
     ;; There is room for insertion without re-aligning the table.
-    (self-insert-command N)
+    (org-fold-core-ignore-modifications
+      (self-insert-command N))
     (org-table-with-shrunk-field
      (save-excursion
        (skip-chars-forward "^|")
@@ -16499,8 +16500,9 @@ overwritten, and the table is not marked as requiring realignment."
        (delete-region (- (point) 2) (1- (point))))))
    (t
     (setq org-table-may-need-update t)
-    (self-insert-command N)
-    (org-fix-tags-on-the-fly)
+    (org-fold-core-ignore-modifications
+      (self-insert-command N)
+      (org-fix-tags-on-the-fly))
     (when org-self-insert-cluster-for-undo
       (if (not (eq last-command 'org-self-insert-command))
 	  (setq org-self-insert-command-undo-counter 1)