diff --git a/lisp/org.el b/lisp/org.el
index 7a5be1f08..cfa5e9b24 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5513,7 +5513,8 @@ the language, a switch telling of the content should be in a single line."
     (when font-lock-mode
       (font-lock-unfontify-region (point-min) (point-max)))
     (put-text-property (point-min) (point-max) 'font-lock-fontified t))
-  (kill-buffer (current-buffer)))
+  (kill-buffer (current-buffer))
+  (and (org-mode-p) (org-restart-font-lock)))
 
 ;;;; Plain list items, including checkboxes