diff --git a/shells/fish/conf.d/10-abbr.fish b/shells/fish/conf.d/10-abbr.fish
index c3ee4b2..26f0b12 100644
--- a/shells/fish/conf.d/10-abbr.fish
+++ b/shells/fish/conf.d/10-abbr.fish
@@ -26,7 +26,6 @@ if status --is-interactive
     abbr --add l ls
     abbr --add ping ping -c 3
     abbr --add pingtest ping -c 3 mmk2410.org
-    abbr --add e eval $EDITOR
     abbr --add g git
     abbr --add s sudo
 end
diff --git a/shells/fish/conf.d/10-alias.fish b/shells/fish/conf.d/10-alias.fish
index 6aaa659..4e41a61 100644
--- a/shells/fish/conf.d/10-alias.fish
+++ b/shells/fish/conf.d/10-alias.fish
@@ -33,4 +33,5 @@ if status --is-interactive
     alias x=' exit'
     alias o='xdg-open'
     alias vim="nvim"
+    alias e="es"
 end