diff --git a/init.d/basics/global-variables.el b/init.d/basics/global-variables.el
index 01e014d..d62c297 100644
--- a/init.d/basics/global-variables.el
+++ b/init.d/basics/global-variables.el
@@ -66,8 +66,9 @@ If t, run `whitespace-cleanup', `clang-format-buffer' and so on."
 
 (use-package with-editor
   :after (server)
+  :defer nil
   :config (progn
-            (setenv (with-editor-locate-emacsclient))))
+            (setenv "EDITOR" (with-editor-locate-emacsclient))))
 
 (provide 'basics/global-variables)
 ;;; global-variables.el ends here