diff --git a/fish/config.fish b/fish/config.fish
index b47d60adb..40a4e809d 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -14,7 +14,7 @@ function fish_right_prompt
    echo -n ']'
 end
 
-set -gx EDITOR emacsclient
+set -gx EDITOR "emacsclient -n -create-frame"
 set -gx ALTERNATE_EDITOR emacs
 set -gx VISUAL emacsclient
 
diff --git a/fish/functions/edit.fish b/fish/functions/edit.fish
index 83f6eb854..61bf37345 100644
--- a/fish/functions/edit.fish
+++ b/fish/functions/edit.fish
@@ -1,3 +1,3 @@
 function edit
-    emacsclient -no-wait $argv
+    emacsclient -no-wait -create-frame $argv
 end
\ No newline at end of file