diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 638906a..59c2fcb 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -78,7 +78,7 @@ avandu.ttrss_url = "https://ryuslash.org/tt-rss/api/"
 
 -- This is used later as the default terminal and editor to run.
 terminal = "urxvtc"
-editor = "emacsclient -c"
+editor = "emacsclient"
 editor_cmd = editor
 
 -- Default modkey.
diff --git a/git/.config/git/config b/git/.config/git/config
index 82dfec2..0d0e647 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -2,7 +2,7 @@
 	name = Tom Willemse
 	email = tom@ryuslash.org
 [core]
-	editor = emacs -nw
+	editor = emacsclient -a emacs
 	whitespace = trailing-space,tab-in-indent,space-before-tab
 [color]
 	ui = auto
diff --git a/zsh/.zprofile b/zsh/.zprofile
index 290b7c1..9748d66 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -1,5 +1,5 @@
 export BROWSER=conkeror
-export EDITOR="emacsclient -c -a emacs"
+export EDITOR="emacsclient -a emacs"
 
 PATH="$HOME/usr/bin:$PATH"
 PATH="/usr/local/heroku/bin:$PATH"