diff --git a/core/core-autoinsert.el b/core/core-autoinsert.el
index f5b0e2734..7ec904c3f 100644
--- a/core/core-autoinsert.el
+++ b/core/core-autoinsert.el
@@ -34,8 +34,9 @@
 
           ;; Elisp
           ("-test\\.el$"                     "__"               emacs-ert-mode)
-          ("\\.emacs\\.d/.+\\.el$"           "__initfile"       emacs-lisp-mode)
-          ("\\.emacs\\.d/private/\\(snippets\\|templates\\)/.+$" "__" snippet-mode)
+          ("/.+\\.el$"                       "__initfile"       emacs-lisp-mode)
+          ("\\(\\.emacs\\.d\\|narf-emacs\\)/private/\\(snippets\\|templates\\)/.+$"
+           "__" snippet-mode)
 
           ;; Go
           ("/main\\.go$"                     "__main.go"        go-mode t)