diff --git a/configs/shared/misc/.config/i3/config b/configs/shared/misc/.config/i3/config
index ac41de318..0756f344c 100644
--- a/configs/shared/misc/.config/i3/config
+++ b/configs/shared/misc/.config/i3/config
@@ -41,13 +41,13 @@ floating_modifier $mod
 # Vertical
 bindsym $mod+Ctrl+t            split v; exec st
 bindsym $mod+Ctrl+Return       split v; exec st
-bindsym $mod+Ctrl+e            split v; exec emacs
+bindsym $mod+Ctrl+e            split v; exec emacsclient --create-frame ~/programming
 bindsym $mod+Ctrl+c            split v; exec google-chrome
 bindsym $mod+Ctrl+s            split v; exec spotify
 # Horizontal
 bindsym $mod+Ctrl+Shift+t      split h; exec st
 bindsym $mod+Ctrl+Shift+Return split h; exec st
-bindsym $mod+Ctrl+Shift+e      split h; exec emacs
+bindsym $mod+Ctrl+Shift+e      split h; exec emacsclient --create-frame ~/programming
 bindsym $mod+Ctrl+Shift+c      split h; exec google-chrome
 bindsym $mod+Ctrl+Shift+s      split h; exec spotify
 
diff --git a/configs/shared/x_server/.xsessionrc.shared b/configs/shared/x_server/.xsessionrc.shared
index e53c36942..b19e3359e 100644
--- a/configs/shared/x_server/.xsessionrc.shared
+++ b/configs/shared/x_server/.xsessionrc.shared
@@ -16,6 +16,9 @@ xsetroot -solid "#333333"
 # This might be better for SSH.
 tmux new -d -s main
 
+# Start the Emacs server
+emacs --daemon
+
 # set kbds
 xmodmap -e 'remove Lock = Caps_Lock'
 xmodmap -e 'keysym Caps_Lock = Escape'
diff --git a/configs/shared/zsh/aliases.zsh b/configs/shared/zsh/aliases.zsh
index 515cf9bf5..9ede83c80 100644
--- a/configs/shared/zsh/aliases.zsh
+++ b/configs/shared/zsh/aliases.zsh
@@ -20,7 +20,7 @@ alias ls="exa"
 alias ll="exa -l"
 alias la="exa -la"
 alias lorem="echo Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-alias e="emacsclient --no-wait"
+alias e="emacsclient --no-wait --create-frame"
 alias cat="bat"
 alias j='fasd_cd -d' # to emulate autojump; my muscle memory is hardened here
 alias vim=nvim # prefer neovim to vim