diff --git a/dotfiles/lib/editor.sh b/dotfiles/lib/editor.sh
index 0145f0c1..3b6d637f 100755
--- a/dotfiles/lib/editor.sh
+++ b/dotfiles/lib/editor.sh
@@ -1,3 +1,8 @@
 #!/usr/bin/env zsh
-emacsclient "$@"
+if is_osx; then
+   reattach-to-user-namespace emacsclient "$@"
+else
+	emacsclient "$@"
+fi
+	
 return 0
diff --git a/dotfiles/lib/shellenv/emacs.sh b/dotfiles/lib/shellenv/emacs.sh
index 65c50923..a60e9a0b 100644
--- a/dotfiles/lib/shellenv/emacs.sh
+++ b/dotfiles/lib/shellenv/emacs.sh
@@ -9,8 +9,8 @@
 # alias terminal_emacs='_emacs -t'
 # is_ssh && emacs="terminal_emacs"
 
-alias emacs='emacsclient -tn'
-is_osx && alias emacs='emacsclient -cn'
+alias emacs='emacsclient -t -n'
+is_osx && alias emacs='reattach-to-user-namespace emacsclient -c -n'
 
 function kill_all_emacs {
     emacs_pids | xargs kill -9