diff --git a/core/siren-core-editor.el b/core/siren-core-editor.el
index b5ee54d..58f82c5 100644
--- a/core/siren-core-editor.el
+++ b/core/siren-core-editor.el
@@ -55,9 +55,12 @@
       `((".*" . ,(expand-file-name "backup" siren-cache-dir))))
 
 ;; Auto-save files
-(setq auto-save-interval 20
-      auto-save-file-name-transforms
-      `((".*" ,(expand-file-name "autosave" siren-cache-dir) t)))
+(let ((auto-save-dir (expand-file-name "autosave/" siren-cache-dir)))
+  (unless (file-exists-p auto-save-dir)
+    (make-directory auto-save-dir))
+  (setq auto-save-interval 20
+        auto-save-file-name-transforms
+        `((".*" ,auto-save-dir t))))
 
 ;; smart tab behavior - indent or complete
 (setq tab-always-indent 'complete)