diff --git a/dot_config/fish/executable_config.fish b/dot_config/fish/executable_config.fish
index 0e4eb68..5602d5d 100644
--- a/dot_config/fish/executable_config.fish
+++ b/dot_config/fish/executable_config.fish
@@ -54,6 +54,7 @@ set -x XDG_CURRENT_DESKTOP Unity
 # General Aliases
 alias editconfig "chezmoi edit ~/.config/fish/config.fish; and chezmoi apply; and source ~/.config/fish/config.fish"
 alias j "z"
+alias emacsd "emacs --daemon"
 alias jo "zo"
 alias be "bundle exec"
 alias doc "docker-compose"
diff --git a/dot_config/sway/config b/dot_config/sway/config
index fdb5cfb..17ef8e7 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -53,7 +53,7 @@ seat seat0 hide_cursor 10000
 bindsym $mod+Return exec $term
 
 # Start Emacs
-bindsym $mod+Shift+Return exec emacs
+bindsym $mod+Shift+Return exec emacsclient -c
 
 # Kill focused window
 bindsym $mod+Shift+q kill