diff --git a/.config/fish/conf.d/fzf.fish b/.config/fish/conf.d/fzf.fish
index 0b2d370..5383909 100644
--- a/.config/fish/conf.d/fzf.fish
+++ b/.config/fish/conf.d/fzf.fish
@@ -27,8 +27,7 @@ function __fzf_files
     end
     switch $key
         case ctrl-e
-            set -q EDITOR; or set EDITOR vim
-            commandline -r "$EDITOR $file"
+            commandline -r "edit $file"
         case '*'
             commandline -i $file
     end
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index ff3dc3b..b7a5b15 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -57,7 +57,7 @@ if not set -q __universals_initialized
 
     # Abbreviations
     abbr -a -U d 'docker'
-    abbr -a -U e $EDITOR
+    abbr -a -U e 'edit'
     abbr -a -U h 'history'
     abbr -a -U k 'kubectl'
     abbr -a -U l 'less'
diff --git a/.config/fish/functions/edit.fish b/.config/fish/functions/edit.fish
new file mode 100644
index 0000000..4737a96
--- /dev/null
+++ b/.config/fish/functions/edit.fish
@@ -0,0 +1,8 @@
+function edit
+	if set -q EDITOR
+		$EDITOR $argv
+	else
+		printf (set_color red)"warning: EDITOR was not set, using vim as fallback\n"(set_color normal)
+		vim $argv
+    end
+end