diff --git a/init.el b/init.el
index 4e488c0..807d55c 100644
--- a/init.el
+++ b/init.el
@@ -1030,15 +1030,19 @@ Certificates are assumed to be of the form *.crt."
             (add-hook 'compilation-filter-hook #'endless/colorize-compilation)))
 
 (use-package shell
-  :defer t
+  :commands (shell)
   :config (progn
             (add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on)
-            (add-hook 'comint-output-filter-functions 'comint-strip-ctrl-m)))
+            (add-hook 'comint-output-filter-functions 'comint-strip-ctrl-m)
+            (add-hook 'shell-mode-hook 'with-editor-export-editor)))
 
 (use-package eshell
   :commands (eshell)
   :config (use-package db-eshell))
 
+(use-package with-editor
+  :commands (with-editor-export-editor))
+
 
 ;; * Lisp
 
diff --git a/site-lisp/db-eshell.el b/site-lisp/db-eshell.el
index 46ae5ea..73d504a 100644
--- a/site-lisp/db-eshell.el
+++ b/site-lisp/db-eshell.el
@@ -54,6 +54,9 @@
           (lambda ()
             (add-hook 'eshell-output-filter-functions 'eshell-truncate-buffer)))
 
+(add-hook 'eshell-mode-hook
+          'with-editor-export-editor)
+
 
 ;; Git Completion
 ;; https://tsdh.wordpress.com/2013/05/31/eshell-completion-for-git-bzr-and-hg/