diff --git a/init.d/basics/global-variables.el b/init.d/basics/global-variables.el
index d0e9b0f..01e014d 100644
--- a/init.d/basics/global-variables.el
+++ b/init.d/basics/global-variables.el
@@ -64,5 +64,10 @@ If t, run `whitespace-cleanup', `clang-format-buffer' and so on."
                     multiplier)))))
   :hook (after-init . my/set-garbage-collection-threshold))
 
+(use-package with-editor
+  :after (server)
+  :config (progn
+            (setenv (with-editor-locate-emacsclient))))
+
 (provide 'basics/global-variables)
 ;;; global-variables.el ends here