diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index 5491d6d..99de8fd 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -67,9 +67,11 @@ hc keybind $Mod-Shift-k remove
 # them is a big productivity boost.
 hc keybind $Mod-Return spawn urxvt
 hc keybind $Mod-c spawn hlwm-run-or-raise URxvt urxvt
-hc keybind $Mod-t spawn hlwm-run-or-raise Emacs emacs
 hc keybind $Mod-b spawn hlwm-run-or-raise Conkeror conkeror
 
+hc keybind $Mod-t spawn hlwm-run-or-raise Emacs \
+   emacsclient --create-frame --alternate-editor=''
+
 # Since I use the colemak keyboard layout, hjkl doesn't make much
 # sense. I use neio instead since that is almost in the same place
 # (though one place to the right). I try to use my run-or-raise script