diff --git a/home/default/.config/shell/profile b/home/default/.config/shell/profile
index 990b7ff..b8e5387 100644
--- a/home/default/.config/shell/profile
+++ b/home/default/.config/shell/profile
@@ -14,7 +14,7 @@ export PATH="$PATH:$HOME/.emacs.d/bin"
 unsetopt PROMPT_SP
 
 # Default programs:
-export EDITOR="nvim"
+export EDITOR="emnw"
 export TERMINAL="foot"
 export BROWSER="librewolf"
 
diff --git a/home/default/.config/sway/config b/home/default/.config/sway/config
index e2f8bff..e0c5a9e 100644
--- a/home/default/.config/sway/config
+++ b/home/default/.config/sway/config
@@ -144,14 +144,14 @@ bindsym $mod+F1 exec $term -e $editor ~/.config/sway/config
 bindsym $mod+w exec $browser
 
 # agenda
-bindsym $mod+c exec emacsclient -c --eval '(org-agenda-list)'
+bindsym $mod+c exec $term -e $editor --eval '(org-agenda-list)'
 
 # diary
-bindsym $mod+Control+n exec emacsclient -c --eval '(org-journal-new-entry 1)'
+bindsym $mod+Control+n $term -e $editor --eval '(org-journal-new-entry 1)'
 
 # notebook
-bindsym $mod+n exec emacsclient -c -a emacs ~/notebook/index.org
-bindsym $mod+Control+r exec emacsclient -c -a emacs ~/notebook/refile.org
+bindsym $mod+n exec $term -e $editor ~/notebook/index.org
+bindsym $mod+Control+r $term -e $editor ~/notebook/refile.org
 
 # newsboat (rss)
 bindsym $mod+Shift+n exec $term -e newsboat
@@ -163,7 +163,8 @@ bindsym $mod+Shift+t exec $term -e swaync-client -t
 bindsym $mod+r exec $term -e lf
 
 # emacs
-bindsym $mod+e exec emacsclient --create-frame --alternate-editor=emacs
+bindsym $mod+e exec $term -e $editor
+bindsym $mod+Shift+e exec em
 
 # mail
 #bindsym $mod+e exec $term -e neomutt
@@ -172,7 +173,7 @@ bindsym $mod+e exec emacsclient --create-frame --alternate-editor=emacs
 bindsym $mod+x exec start-tasks
 
 # bookmarks
-bindsym $mod+b exec emacsclient --create-frame --alternate-editor=emacs ~/notebook/bookmarks.org
+bindsym $mod+b exec $term -e $editor ~/notebook/bookmarks.org
 bindsym $mod+shift+b exec bookmark
 bindsym $mod+Insert exec ydotool type "$(grep -v '^#' ~/notebook/bookmarks/bookmarks.org | dmenu -l 50 | cut -d' ' -f1)"
 
diff --git a/home/default/.local/bin/em b/home/default/.local/bin/em
new file mode 100755
index 0000000..5674a6a
--- /dev/null
+++ b/home/default/.local/bin/em
@@ -0,0 +1,2 @@
+#!/bin/sh
+setsid -f emacsclient --create-frame --alternate-editor='emacs' $@ >/dev/null 2>&1
diff --git a/home/default/.local/bin/emnw b/home/default/.local/bin/emnw
new file mode 100755
index 0000000..1f0035f
--- /dev/null
+++ b/home/default/.local/bin/emnw
@@ -0,0 +1,2 @@
+#!/bin/sh
+emacsclient -nw -c --alternate-editor='emacs -nw' $@