diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index ea8580b90..d17cc6c51 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -618,13 +618,11 @@ mutating hooks on exported output, like formatters."
 
   (defun +org--restart-mode-h ()
     "Restart `org-mode', but only once."
+    (quiet! (org-mode-restart))
+    (delq! (current-buffer) org-agenda-new-buffers)
     (remove-hook 'doom-switch-buffer-hook #'+org--restart-mode-h
                  'local)
-    (delq! (current-buffer) org-agenda-new-buffers)
-    (let ((file buffer-file-name)
-          (inhibit-redisplay t))
-      (kill-buffer)
-      (find-file file)))
+    (run-hooks 'find-file-hook))
 
   (add-hook! 'org-agenda-finalize-hook
     (defun +org-exclude-agenda-buffers-from-workspace-h ()