diff --git a/core/core-auto-insert.el b/core/core-auto-insert.el
index 389d29336..68f3c09ef 100644
--- a/core/core-auto-insert.el
+++ b/core/core-auto-insert.el
@@ -13,6 +13,12 @@
       (nth 0 rule)
       (vector `(lambda () (narf/auto-insert-snippet ,(nth 1 rule) ',(nth 2 rule) ,(nth 3 rule))))))
 
+  (after! org-mode
+    (mapc 'auto-insert-template'
+          '((,(format "%s.+\\.org$" (f-relative org-directory-contacts org-directory)) "__contact.org"  org-mode)
+            (,(format "%s.+\\.org$" (f-relative org-directory-projects org-directory)) "__projects.org" org-mode)
+            (,(format "%s.+\\.org$" (f-relative org-directory-invoices org-directory)) "__invoices.org" org-mode))))
+
   (mapc 'auto-insert-template
         `(;; General
           ("/\\.gitignore$"                  "__"               gitignore-mode)
@@ -54,11 +60,6 @@
           ;; Markdown
           ("\\.md$"                          "__"               markdown-mode)
 
-          ;; Org
-          (,(format "%s.+\\.org$" (f-relative org-directory-contacts org-directory)) "__contact.org"  org-mode)
-          (,(format "%s.+\\.org$" (f-relative org-directory-projects org-directory)) "__projects.org" org-mode)
-          (,(format "%s.+\\.org$" (f-relative org-directory-invoices org-directory)) "__invoices.org" org-mode)
-
           ;; PHP
           ("\\.class\\.php$"                 "__.class.php"     php-mode)
           ("\\.php$"                         "__"               php-mode)