diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 780f58b..9a80be4 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -37,9 +37,9 @@ main = xmonad $ defaultConfig
          ("C-z ,", screenWorkspace 0 >>= flip whenJust (windows . W.view)),
          ("C-z .", screenWorkspace 1 >>= flip whenJust (windows . W.view)),
          ("C-z S-c", spawn "urxvt"),
-         ("C-z S-e", spawn "emacsclient -ca emacs"),
+         ("C-z S-e", spawn "editor"),
          ("C-z c", runOrRaiseNext "urxvt" (className =? "URxvt")),
-         ("C-z e", runOrRaiseNext "emacsclient -ca emacs" (className =? "Emacs")),
+         ("C-z e", runOrRaiseNext "editor" (className =? "Emacs")),
          ("C-z w", runOrRaiseNext "conkeror" (className =? "Conkeror")),
          ("M-S-1", spawn "dmenu_run"),
          ("M-n", windows W.focusDown),