diff --git a/core/core-editor.el b/core/core-editor.el
index 355dab4cf..fc349f75e 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -180,7 +180,7 @@ savehist file."
 
 (def-package! server
   :when (display-graphic-p)
-  :after-call (pre-command-hook after-find-file)
+  :after-call (pre-command-hook after-find-file focus-out-hook)
   :init
   (when-let (name (getenv "EMACS_SERVER_NAME"))
     (setq server-name name))