diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 173c285..4dc6873 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -337,9 +337,7 @@
 (global-set-key (kbd "\"") 'oni:self-insert-dwim)
 
 (if (daemonp)
-    (global-set-key "\C-x\C-c" 'oni:close-client-window)
-  (unless (server-running-p)
-    (server-start)))
+    (global-set-key "\C-x\C-c" 'oni:close-client-window))
 
 (when (or window-system (daemonp))
   (global-unset-key "\C-z"))
@@ -404,6 +402,7 @@
 (global-set-key (kbd "C-z") 'quick-edit-mode)
 
 (unless (server-running-p)
+  (server-start)
   (load "wm-init"))
 
 (provide 'init)