diff --git a/.config/bin/unison-merge-files b/.config/bin/unison-merge-files
index 4ab495e..6dc20df 100755
--- a/.config/bin/unison-merge-files
+++ b/.config/bin/unison-merge-files
@@ -3,7 +3,7 @@ CURRENT1=$1
 CURRENT2=$2
 NEW=$3
 CURRENTARCHOPT=$4
-EMACS="emacsclient -c"
+EMACS='emacsclient -a "" -ncs default'
 if [ x$CURRENTARCHOPT = x ]; then
 	  $EMACS --eval "(emerge-files nil \"$CURRENT1\" \"$CURRENT2\" \"$NEW\")"
 else
diff --git a/.config/environment.d/emacs.conf b/.config/environment.d/emacs.conf
index 4357eba..4d5e181 100644
--- a/.config/environment.d/emacs.conf
+++ b/.config/environment.d/emacs.conf
@@ -1,5 +1,5 @@
 MOZ_USE_OMTC=1
-EDITOR="emacsclient -nc"
+EDITOR='emacsclient -a "" -ncs default'
 JAVA_HOME="/usr/lib/jvm/default"
 LD_LIBRARY_PATH=$JAVA_HOME/jre/lib/amd64/server
 TERMCMD="kitty"
diff --git a/.config/rofi/config b/.config/rofi/config
index 4f5bc7a..7b5cfa3 100644
--- a/.config/rofi/config
+++ b/.config/rofi/config
@@ -12,4 +12,4 @@ rofi.padding: 10
 rofi.bw: 0
 rofi.lines: 10
 rofi.combi-modi: drun,run
-rofi.modi: combi,calc:qalc +u8 -nocurrencies,clipboard:greenclip print,emoji:~/.config/rofi/splatmoji
+rofi.modi: combi,calc:qalc +u8 -nocurrencies,clipboard:greenclip print,emacs:~/.config/rofi/emacsclient,emoji:~/.config/rofi/splatmoji
diff --git a/.config/rofi/emacsclient b/.config/rofi/emacsclient
new file mode 100755
index 0000000..123b84d
--- /dev/null
+++ b/.config/rofi/emacsclient
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ -z $@ ]
+then
+    ls /run/user/1000/emacs/
+else
+  IFS='';session=$@
+  emacsclient -a "" -ncs $session
+fi
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index a1942e7..d2ea6f4 100755
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -107,7 +107,7 @@ super + ctrl + space
 
 # Emacs client
 super + Return
- emacsclient -nc
+ emacsclient -a "" -ncs default
 
 # Arandr
 XF86Display
diff --git a/.profile b/.profile
index e8a23c6..d7b9dfa 100644
--- a/.profile
+++ b/.profile
@@ -2,7 +2,7 @@
 source /etc/profile
 
 export MOZ_USE_OMTC=1
-export EDITOR="emacsclient -nc"
+export EDITOR='emacsclient -a "" -ncs default'
 export JAVA_HOME="/usr/lib/jvm/default"
 export LD_LIBRARY_PATH=$JAVA_HOME/jre/lib/amd64/server
 export TERMCMD="kitty"