diff --git a/lisp/editor.el b/lisp/editor.el
index 8236478..32575c1 100644
--- a/lisp/editor.el
+++ b/lisp/editor.el
@@ -33,8 +33,13 @@
 ;; Disable the creation of files ending with '~' (backup files)
 (setq make-backup-files nil)
 
-;; Disable the creation of files with '#' (lock files)
+;; Move files with '#' to system tmp directory
+(setq auto-save-default nil)
 (setq create-lockfiles nil)
+(setq backup-directory-alist
+      `((".*" . ,temporary-file-directory)))
+(setq auto-save-file-name-transforms
+      `((".*" ,temporary-file-directory t)))
 
 ;;; Themes
 ;; Customize doom-themes